Fixed binary output dir for MSVC Windows

Signed-off-by: Bhavye Mathur <[email protected]>
BhavyeMathur · Jan 10, 2024 · 608284b · 608284b
1 parent e92a71c
commit 608284b
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 22 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -52,7 +52,7 @@ jobs:
         run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
       - name: Build goopylib
-        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 8
+        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 8 --target goopylib
 
       - name: Upload Binaries
         uses: test-room-7/action-update-file@v1

diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,6 @@
 build/
 out/
 cmake-*/
-goopylib-build/
 docs/_build/
 dist/
 *.egg-info/
@@ -23,17 +22,10 @@ dist/
 __pycache__/
 *~
 
-*.ilk
-*.pdb
-
-venv/
-venv*/
-.vs/
-.idea/
-
 wheelhouse/
 main.py
 /main.cpp
-main.css
-empty.cpp
 *.log
+
+*/libglfw.a
+*/glfw3.lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,6 +68,12 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/binaries/lib-${GOOPYLIB_P
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/binaries/lib-${GOOPYLIB_PLATFORM_NAME})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/binaries/lib-${GOOPYLIB_PLATFORM_NAME})
 
+if (MSVC)
+    set_target_properties(goopylib PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/binaries/lib-${GOOPYLIB_PLATFORM_NAME})
+    set_target_properties(goopylib PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/binaries/lib-${GOOPYLIB_PLATFORM_NAME})
+    set_target_properties(goopylib PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/binaries/lib-${GOOPYLIB_PLATFORM_NAME})
+endif (MSVC)
+
 add_library(goopylib SHARED ${WINDOWS_SOURCES}
             src/goopylib/core/Core.cpp
             src/goopylib/core/BufferLayout.cpp

diff --git a/binaries/lib-macos/libglfw3.a b/binaries/lib-macos/libglfw3.a
diff --git a/binaries/lib-macos/libgoopylib.dylib b/binaries/lib-macos/libgoopylib.dylib
diff --git a/binaries/lib-vc2022/Release/BrickBreaker.exp b/binaries/lib-vc2022/Release/BrickBreaker.exp
diff --git a/binaries/lib-vc2022/Release/BrickBreaker.lib b/binaries/lib-vc2022/Release/BrickBreaker.lib
diff --git a/binaries/lib-vc2022/Release/Minecraft.exp b/binaries/lib-vc2022/Release/Minecraft.exp
diff --git a/binaries/lib-vc2022/Release/Minecraft.lib b/binaries/lib-vc2022/Release/Minecraft.lib
diff --git a/binaries/lib-vc2022/Release/PackingAlgorithms.exp b/binaries/lib-vc2022/Release/PackingAlgorithms.exp
diff --git a/binaries/lib-vc2022/Release/PackingAlgorithms.lib b/binaries/lib-vc2022/Release/PackingAlgorithms.lib
diff --git a/binaries/lib-vc2022/Release/glfw3.lib b/binaries/lib-vc2022/Release/glfw3.lib
diff --git a/binaries/lib-vc2022/Release/goopylib.dll b/binaries/lib-vc2022/Release/goopylib.dll
diff --git a/binaries/lib-vc2022/Release/goopylib.exp b/binaries/lib-vc2022/Release/goopylib.exp
diff --git a/binaries/lib-vc2022/Release/goopylib.lib b/binaries/lib-vc2022/Release/goopylib.lib
diff --git a/binaries/lib-vc2022/goopylib.dll.manifest b/binaries/lib-vc2022/goopylib.dll.manifest