Explorar o código

Merge pull request #1140 from Areloch/D3DCompilerDLLAdd

Adds the D3DCompiler_47.dll to ensure it's packed and ready for projects when publishing
Brian Roberts hai 1 ano
pai
achega
d671f2611e
Modificáronse 3 ficheiros con 10 adicións e 2 borrados
  1. 1 0
      .gitignore
  2. 9 2
      Templates/BaseGame/CMakeLists.txt
  3. BIN=BIN
      Templates/BaseGame/game/D3DCompiler_47.dll

+ 1 - 0
.gitignore

@@ -68,6 +68,7 @@ local.properties
 .builds
 .builds
 *.dotCover
 *.dotCover
 *.dll
 *.dll
+!d3dcompiler_47.dll
 *.lib
 *.lib
 *.exp
 *.exp
 *.exe
 *.exe

+ 9 - 2
Templates/BaseGame/CMakeLists.txt

@@ -4,8 +4,15 @@ foreach(TEMPLATE_FILE ${TEMPLATE_FILES})
 endforeach()
 endforeach()
 
 
 # Perform installation minus scripts
 # Perform installation minus scripts
-file(COPY "game" "source" DESTINATION "${TORQUE_APP_ROOT_DIRECTORY}" PATTERN "*.tscript" EXCLUDE PATTERN
-                                                                     PATTERN "*.in" EXCLUDE PATTERN)	
+if(WIN32)
+    file(COPY "game" "source" DESTINATION "${TORQUE_APP_ROOT_DIRECTORY}" PATTERN "*.tscript" EXCLUDE
+                                                                         PATTERN "*.in" EXCLUDE)
+else()
+    file(COPY "game" "source" DESTINATION "${TORQUE_APP_ROOT_DIRECTORY}" PATTERN "*.tscript" EXCLUDE
+                                                                     PATTERN "*.in" EXCLUDE
+                                                                     PATTERN "*.dll" EXCLUDE)    
+endif(WIN32)
+
 # Enumerate scripts and install with extension
 # Enumerate scripts and install with extension
 file(GLOB_RECURSE SCRIPT_FILES "game/*.tscript")
 file(GLOB_RECURSE SCRIPT_FILES "game/*.tscript")
 foreach(ITEM ${SCRIPT_FILES})
 foreach(ITEM ${SCRIPT_FILES})

BIN=BIN
Templates/BaseGame/game/D3DCompiler_47.dll