Bläddra i källkod

Bugfix: Fixing build failing to copy 'bsf' dependency .dlls

BearishSun 7 år sedan
förälder
incheckning
f97d6c4973
2 ändrade filer med 7 tillägg och 3 borttagningar
  1. 3 2
      CMakeLists.txt
  2. 4 1
      Source/Banshee3D/CMakeLists.txt

+ 3 - 2
CMakeLists.txt

@@ -1,7 +1,8 @@
 cmake_minimum_required (VERSION 3.9.0)
 cmake_minimum_required (VERSION 3.9.0)
 project (Banshee3D)
 project (Banshee3D)
 
 
-set (BSF_SOURCE_DIR ${PROJECT_SOURCE_DIR}/Source/bsf/Source)
+set (BSF_DIRECTORY ${PROJECT_SOURCE_DIR}/Source/bsf)
+set (BSF_SOURCE_DIR ${BSF_DIRECTORY}/Source)
 set (APP_ROOT_DIR ${PROJECT_SOURCE_DIR})
 set (APP_ROOT_DIR ${PROJECT_SOURCE_DIR})
 set (BS_IS_BANSHEE3D 1)
 set (BS_IS_BANSHEE3D 1)
 
 
@@ -38,7 +39,7 @@ check_and_update_binary_deps(Banshee ${PROJECT_SOURCE_DIR}/Dependencies/ ${BS_PR
 
 
 ## Check data dependencies
 ## Check data dependencies
 check_and_update_builtin_assets(Banshee ${PROJECT_SOURCE_DIR}/Data ${BS_BUILTIN_ASSETS_VERSION} YES)
 check_and_update_builtin_assets(Banshee ${PROJECT_SOURCE_DIR}/Data ${BS_BUILTIN_ASSETS_VERSION} YES)
-	
+		
 # Generate script bindings
 # Generate script bindings
 include(${BSF_SOURCE_DIR}/CMake/GenerateScriptBindings.cmake)
 include(${BSF_SOURCE_DIR}/CMake/GenerateScriptBindings.cmake)
 	
 	

+ 4 - 1
Source/Banshee3D/CMakeLists.txt

@@ -25,4 +25,7 @@ add_dependencies(Banshee3D bsfFBXImporter bsfFontImporter bsfFreeImgImporter SBa
 # Compiler flags
 # Compiler flags
 if(MSVC)
 if(MSVC)
 	target_compile_options(Banshee3D PUBLIC /wd4509)
 	target_compile_options(Banshee3D PUBLIC /wd4509)
-endif()
+endif()
+
+# Make sure `bsf` dlls are copied to our folders
+copyBsfBinaries(Banshee3D ${BSF_DIRECTORY})