Merge pull request #11 from wagrenier/FixReleasePipeline

Fix Release Pipeline
Mikompilation · Nov 28, 2023 · c4fdb79 · c4fdb79
2 parents 4ba382c + af50a24
commit c4fdb79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,4 +13,4 @@ add_subdirectory(third-party)
 add_subdirectory(Extractor)
 add_subdirectory(ModelConverter)
 
-add_custom_target(copy-runtime-files ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ./resource ${CMAKE_BINARY_DIR}/Obscura DEPENDS ${MY_TARGET})
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/resource/ZeroFileDictionary.json DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
diff --git a/ModelConverter/game/packfile.h b/ModelConverter/game/packfile.h
@@ -2,10 +2,11 @@
 
 #include <stdint.h>
 
-typedef struct { // 0x10
-  /* 0x0 */ int pak_num;
-  /* 0x4 */ int map_flg;
-  /* 0x8 */ int pad[2];
+typedef struct
+{
+  int pak_num;
+  int map_flg;
+  int pad[2];
 } MANMPK_HEADER;
 
 struct PK2_HEAD