Merge pull request #4 from JonnycatMeow/master

Vortex2Oblivion · Nov 24, 2023 · 227ab6e · 227ab6e
2 parents ee6d938 + 1c19748
commit 227ab6e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 test/demos/*/bin
 test/demos/*/cpp
-.vscode
+.vscode
+.DS_Store
diff --git a/hxpy/Build.xml b/hxpy/Build.xml
@@ -222,12 +222,17 @@
 	</files>
 
     <target id="haxe" tool='linker'>
-		<lib name="${haxelib:hxpy}/libs/python3.lib" />
-		<lib name="${haxelib:hxpy}/libs/python311.lib" />
-		<lib name="${haxelib:hxpy}/libs/_tkinter.lib" />
+	    <section if="windows"> 
+		<lib name="${haxelib:hxpy}/libs/Windows/python3.lib"/>
+		<lib name="${haxelib:hxpy}/libs/Windows/python311.lib"/>
+		<lib name="${haxelib:hxpy}/libs/Windows/_tkinter.lib"/>
+		<lib name="${haxelib:hxpy}/libs/Windows/python3_d.lib" if="debug"/>
+		<lib name="${haxelib:hxpy}/libs/Windows/python311_d.lib" if="debug"/> 
+		</section>
 
-		<lib name="${haxelib:hxpy}/libs/python3_d.lib" if="debug" />
-		<lib name="${haxelib:hxpy}/libs/python311_d.lib" if="debug" />
+		<section if="macos">  
+		<lib name="${haxelib:hxpy}/libs/macOS/x86_64/libpython3.11.a" if="HXCPP_M64"/>
+		</section>
 	</target>
 
 	<copyFile name="_asyncio.pyd" from="${haxelib:hxpy}/package" toolId="exe" />

diff --git a/libs/_tkinter.lib → libs/Windows/_tkinter.lib b/libs/_tkinter.lib → libs/Windows/_tkinter.lib
diff --git a/libs/python3.lib → libs/Windows/python3.lib b/libs/python3.lib → libs/Windows/python3.lib
diff --git a/libs/python311.lib → libs/Windows/python311.lib b/libs/python311.lib → libs/Windows/python311.lib
diff --git a/libs/python311_d.lib → libs/Windows/python311_d.lib b/libs/python311_d.lib → libs/Windows/python311_d.lib
diff --git a/libs/python3_d.lib → libs/Windows/python3_d.lib b/libs/python3_d.lib → libs/Windows/python3_d.lib
diff --git a/libs/macOS/x86_64/libpython3.11.a b/libs/macOS/x86_64/libpython3.11.a