Przeglądaj źródła

Fix UIThemes.pak to be copied along with the Player on Linux and Windows (it at least looks like it is already done one Mac istn't it?). Also copying UIThemes.pak to /Framework/Modules/Assets.

Joachim Meyer 10 lat temu
rodzic
commit
6081e9662a

+ 6 - 0
Assets/CMakeLists.txt

@@ -0,0 +1,6 @@
+ADD_SUBDIRECTORY("Default asset pack")
+ADD_SUBDIRECTORY("Templates")
+
+IF(POLYCODE_INSTALL_FRAMEWORK)
+    INSTALL(FILES UIThemes.pak DESTINATION Modules/Assets)
+ENDIF(POLYCODE_INSTALL_FRAMEWORK)

+ 2 - 3
CMakeLists.txt

@@ -52,9 +52,8 @@ SET(CMAKE_PREFIX_PATH
     ${POLYCODE_RELEASE_DIR}/Framework/Tools/Dependencies)
 
 # Process subdirectories
-ADD_SUBDIRECTORY(Core/Contents)
-ADD_SUBDIRECTORY("Assets/Default asset pack")
-ADD_SUBDIRECTORY("Assets/Templates")
+ADD_SUBDIRECTORY("Core/Contents")
+ADD_SUBDIRECTORY("Assets")
 ADD_SUBDIRECTORY("Documentation")
 
 IF(POLYCODE_BUILD_BINDINGS)

+ 2 - 0
Player/Contents/CMakeLists.txt

@@ -467,6 +467,7 @@ ENDIF(MSVC OR MINGW)
 IF(MSVC OR MINGW)
     INSTALL(FILES "${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/default.pak" DESTINATION Player)
     INSTALL(FILES "${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/hdr.pak" DESTINATION Player)
+	INSTALL(FILES "${Polycode_SOURCE_DIR}/Assets/UIThemes.pak" DESTINATION Player)
     INSTALL(FILES "${Polycode_SOURCE_DIR}/Assets/SamplePolyapp/main.polyapp" DESTINATION Player)
     INSTALL(FILES "${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/API/api.pak" DESTINATION Player)
     INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/bin/OpenAL32.dll DESTINATION Player)
@@ -474,6 +475,7 @@ ELSEIF(APPLE)
 ELSE(MSVC OR MINGW)
     INSTALL(FILES "${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/default.pak" DESTINATION Player)
     INSTALL(FILES "${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/hdr.pak" DESTINATION Player)
+	INSTALL(FILES "${Polycode_SOURCE_DIR}/Assets/UIThemes.pak" DESTINATION Player)
     INSTALL(FILES "${Polycode_SOURCE_DIR}/Assets/SamplePolyapp/main.polyapp" DESTINATION Player)
     INSTALL(FILES "${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/API/api.pak" DESTINATION Player)
 ENDIF(MSVC OR MINGW)

+ 4 - 0
Standalone/CMakeLists.txt

@@ -23,6 +23,7 @@ IF(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/hdr.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/api.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UI.pak DESTINATION Player)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UIThemes.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics2D.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics3D.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/StandalonePlayer.exe DESTINATION Publish/Win)
@@ -30,6 +31,7 @@ IF(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/hdr.pak DESTINATION Publish/Win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/api.pak DESTINATION Publish/Win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UI.pak DESTINATION Publish/Win)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UIThemes.pak DESTINATION Publish/Win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics2D.pak DESTINATION Publish/Win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics3D.pak DESTINATION Publish/Win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/main.polyapp DESTINATION Publish/Win)
@@ -56,6 +58,7 @@ ELSE(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/hdr.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/api.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UI.pak DESTINATION Player)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UIThemes.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics2D.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics3D.pak DESTINATION Player)
 	INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Player/StandalonePlayer DESTINATION Publish/Linux)
@@ -63,6 +66,7 @@ ELSE(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/hdr.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/api.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UI.pak DESTINATION Publish/Linux)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UIThemes.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics2D.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics3D.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/main.polyapp DESTINATION Publish/Linux)