Merge branch 'master' of code.modal.sh:modal-studios/izanagi-2022

CMakeLists.txt

@@ -63,29 +63,29 @@ endif()
 # Specify directories
 #
 include_directories(
-  "${PROJECT_SOURCE_DIR}/subprojects/SDL/include"
-  "${PROJECT_SOURCE_DIR}/dependencies/SDL2_image"
-  "${PROJECT_SOURCE_DIR}/dependencies/SDL2_image/include"
-  "${PROJECT_SOURCE_DIR}/dependencies/SDL2_ttf/include"
-  "${PROJECT_SOURCE_DIR}/subprojects/minIni/dev"
-  "${PROJECT_SOURCE_DIR}/subprojects/bdd-for-c"
-  "${PROJECT_SOURCE_DIR}/subprojects/bdd-for-c-mocks"
-  "${PROJECT_SOURCE_DIR}/subprojects/portmidi/pm_common"
-  "${PROJECT_SOURCE_DIR}/dependencies/spine-runtimes/spine-c/spine-c/include"
-  "${PROJECT_SOURCE_DIR}/dependencies/getopt-for-windows"
-  "${PROJECT_SOURCE_DIR}/dependencies/libwebsockets/build/include"
-  "${PROJECT_SOURCE_DIR}/dependencies/openssl/${IZ_PROJECT_ARCH}/include"
-  "${PROJECT_SOURCE_DIR}/dependencies/sqlite"
+  "${CMAKE_HOME_DIRECTORY}/subprojects/SDL/include"
+  "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_image"
+  "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_image/include"
+  "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_ttf/include"
+  "${CMAKE_HOME_DIRECTORY}/subprojects/minIni/dev"
+  "${CMAKE_HOME_DIRECTORY}/subprojects/bdd-for-c"
+  "${CMAKE_HOME_DIRECTORY}/subprojects/bdd-for-c-mocks"
+  "${CMAKE_HOME_DIRECTORY}/subprojects/portmidi/pm_common"
+  "${CMAKE_HOME_DIRECTORY}/dependencies/spine-runtimes/spine-c/spine-c/include"
+  "${CMAKE_HOME_DIRECTORY}/dependencies/getopt-for-windows"
+  "${CMAKE_HOME_DIRECTORY}/dependencies/libwebsockets/build/include"
+  "${CMAKE_HOME_DIRECTORY}/dependencies/openssl/${IZ_PROJECT_ARCH}/include"
+  "${CMAKE_HOME_DIRECTORY}/dependencies/sqlite"
 )
 
 if (IZ_PLATFORM STREQUAL "WINDOWS")
   link_directories(
-    "${PROJECT_SOURCE_DIR}/subprojects/SDL/VisualC/${IZ_SDL_ARCH}/${CMAKE_BUILD_TYPE}"
-    "${PROJECT_SOURCE_DIR}/dependencies/SDL2_image/lib/${IZ_PROJECT_ARCH}"
-    "${PROJECT_SOURCE_DIR}/dependencies/SDL2_ttf/lib/${IZ_PROJECT_ARCH}"
-    "${PROJECT_SOURCE_DIR}/subprojects/portmidi/build/Release"
-    "${PROJECT_SOURCE_DIR}/dependencies/libwebsockets/build/lib/Release"
-    "${PROJECT_SOURCE_DIR}/dependencies/openssl/${IZ_PROJECT_ARCH}/lib"
+    "${CMAKE_HOME_DIRECTORY}/subprojects/SDL/VisualC/${IZ_SDL_ARCH}/${CMAKE_BUILD_TYPE}"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_image/lib/${IZ_PROJECT_ARCH}"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_ttf/lib/${IZ_PROJECT_ARCH}"
+    "${CMAKE_HOME_DIRECTORY}/subprojects/portmidi/build/Release"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/libwebsockets/build/lib/Release"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/openssl/${IZ_PROJECT_ARCH}/lib"
   )
   if (NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
     set(IZ_EXECUTABLE_TYPE WIN32)
@@ -371,71 +371,71 @@ add_executable(
 if (IZ_PLATFORM STREQUAL "WINDOWS")
   add_custom_command(TARGET game POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/subprojects/SDL/VisualC/${IZ_SDL_ARCH}/${CMAKE_BUILD_TYPE}/SDL2.dll"
+    "${CMAKE_HOME_DIRECTORY}/subprojects/SDL/VisualC/${IZ_SDL_ARCH}/${CMAKE_BUILD_TYPE}/SDL2.dll"
     $<TARGET_FILE_DIR:game>)
 
   add_custom_command(TARGET game POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/dependencies/SDL2_image/lib/${IZ_PROJECT_ARCH}/SDL2_image.dll"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_image/lib/${IZ_PROJECT_ARCH}/SDL2_image.dll"
     $<TARGET_FILE_DIR:game>)
 
   add_custom_command(TARGET game POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/dependencies/SDL2_ttf/lib/${IZ_PROJECT_ARCH}/SDL2_ttf.dll"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_ttf/lib/${IZ_PROJECT_ARCH}/SDL2_ttf.dll"
     $<TARGET_FILE_DIR:game>)
 
   add_custom_command(TARGET game POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/subprojects/portmidi/build/Release/portmidi.dll"
+    "${CMAKE_HOME_DIRECTORY}/subprojects/portmidi/build/Release/portmidi.dll"
     $<TARGET_FILE_DIR:game>)
 
   add_custom_command(TARGET game POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/dependencies/libwebsockets/build/bin/Release/websockets.dll"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/libwebsockets/build/bin/Release/websockets.dll"
     $<TARGET_FILE_DIR:game>)
 
   add_custom_command(TARGET game POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libssl-1_1-${IZ_SDL_ARCH}.dll"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libssl-1_1-${IZ_SDL_ARCH}.dll"
     $<TARGET_FILE_DIR:game>)
 
   add_custom_command(TARGET game POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libcrypto-1_1-${IZ_SDL_ARCH}.dll"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libcrypto-1_1-${IZ_SDL_ARCH}.dll"
     $<TARGET_FILE_DIR:game>)
 
   add_custom_command(TARGET server POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/subprojects/SDL/VisualC/${IZ_SDL_ARCH}/${CMAKE_BUILD_TYPE}/SDL2.dll"
+    "${CMAKE_HOME_DIRECTORY}/subprojects/SDL/VisualC/${IZ_SDL_ARCH}/${CMAKE_BUILD_TYPE}/SDL2.dll"
     $<TARGET_FILE_DIR:server>)
 
   add_custom_command(TARGET server POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/dependencies/libwebsockets/build/bin/Release/websockets.dll"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/libwebsockets/build/bin/Release/websockets.dll"
     $<TARGET_FILE_DIR:server>)
 
   add_custom_command(TARGET server POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libssl-1_1-${IZ_SDL_ARCH}.dll"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libssl-1_1-${IZ_SDL_ARCH}.dll"
     $<TARGET_FILE_DIR:server>)
 
   add_custom_command(TARGET server POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libcrypto-1_1-${IZ_SDL_ARCH}.dll"
+    "${CMAKE_HOME_DIRECTORY}/dependencies/openssl/${IZ_PROJECT_ARCH}/bin/libcrypto-1_1-${IZ_SDL_ARCH}.dll"
     $<TARGET_FILE_DIR:server>)
 
   add_custom_command(TARGET game-test-input POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    "${PROJECT_SOURCE_DIR}/subprojects/SDL/VisualC/${IZ_SDL_ARCH}/${CMAKE_BUILD_TYPE}/SDL2.dll"
+    "${CMAKE_HOME_DIRECTORY}/subprojects/SDL/VisualC/${IZ_SDL_ARCH}/${CMAKE_BUILD_TYPE}/SDL2.dll"
     $<TARGET_FILE_DIR:game-test-input>)
 endif ()
 
 add_custom_command(TARGET game POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
-  "${PROJECT_SOURCE_DIR}/assets"
+  "${CMAKE_HOME_DIRECTORY}/assets"
   $<TARGET_FILE_DIR:game>/assets)
 
 add_custom_command(TARGET asset-inv POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
-  "${PROJECT_SOURCE_DIR}/assets"
+  "${CMAKE_HOME_DIRECTORY}/assets"
   $<TARGET_FILE_DIR:game>/assets)

README.md

@@ -9,6 +9,7 @@ The following tools are required:
 * CMake
 * Ninja
 * Clang
+* [Windows SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/) (Windows)
 * `autoconf` (macOS/*NIX)
 * `make` (macOS/*NIX)
 * `libtool` (*NIX)