Fix levels not in subfolder on Linux and Windows

ultitech · Apr 6, 2018 · a08708d · a08708d
1 parent 1a40fc7
commit a08708d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(PROJECT_IDENTIFIER "tech.ulti.indigo")
 # Versioning format: http://semver.org
 set(PROJECT_MAJOR_VERSION 1)
 set(PROJECT_MINOR_VERSION 0)
-set(PROJECT_PATCH_VERSION 0)
+set(PROJECT_PATCH_VERSION 1)
 set(PROJECT_COMPANY "ultitech")
 string(TIMESTAMP YEAR "%Y")
 set(PROJECT_COPYRIGHT "Copyright © 2006-${YEAR}, ${PROJECT_COMPANY}. All rights reserved.")
@@ -89,7 +89,7 @@ if(APPLE)
   set_source_files_properties(${FRAMEWORKS} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
 
   # Copy resources into bundle
-  set(RESOURCES ${PROJECT_SOURCE_DIR}/levels
+  set(RESOURCES ${PROJECT_SOURCE_DIR}/res/levels
                 ${PROJECT_SOURCE_DIR}/Xcode/English.lproj
                 ${PROJECT_SOURCE_DIR}/Xcode/de.lproj)
 
@@ -126,7 +126,7 @@ endif(UNIX AND NOT APPLE)
 if(UNIX AND NOT APPLE OR WIN32)
   add_custom_command(TARGET ${PROJECT_TARGETBIN} POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_directory
-                       ${PROJECT_SOURCE_DIR}/levels $<TARGET_FILE_DIR:${PROJECT_TARGETBIN}>)
+                       ${PROJECT_SOURCE_DIR}/res $<TARGET_FILE_DIR:${PROJECT_TARGETBIN}>)
 endif(UNIX AND NOT APPLE OR WIN32)
 
 if(WIN32)

diff --git a/levels/1 → res/levels/1 b/levels/1 → res/levels/1
diff --git a/levels/2 → res/levels/2 b/levels/2 → res/levels/2
diff --git a/levels/3 → res/levels/3 b/levels/3 → res/levels/3
diff --git a/levels/4 → res/levels/4 b/levels/4 → res/levels/4
diff --git a/levels/5 → res/levels/5 b/levels/5 → res/levels/5
diff --git a/levels/6 → res/levels/6 b/levels/6 → res/levels/6
diff --git a/levels/7 → res/levels/7 b/levels/7 → res/levels/7