WIP: zip support

AlisterT · Sep 25, 2024 · 369a351 · 369a351
1 parent 47c3fc5
commit 369a351
Show file tree

Hide file tree

Showing 18 changed files with 3,253 additions and 109 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -265,7 +265,7 @@ set_property(SOURCE src/main.cpp PROPERTY COMPILE_DEFINITIONS
 	OJ_URL="${PROJECT_HOMEPAGE_URL}"; OJ_BUGREPORT="${OJ_BUGREPORT}")
 
 target_link_libraries(OpenJazz
-	argparse psmplug stb lodepng miniz
+	argparse psmplug stb lodepng mg miniz
 	${OJ_LIBS_SCALE} ${OJ_LIBS_SDL} ${OJ_LIBS_NET} ${OJ_LIBS_HOST})
 
 # platform stuff

diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
@@ -30,7 +30,7 @@ target_include_directories(stb INTERFACE stb)
 # miniz
 
 add_library(miniz STATIC miniz/miniz.h miniz/miniz.cpp)
-target_compile_definitions(miniz INTERFACE MINIZ_NO_ARCHIVE_APIS)
+target_compile_definitions(miniz INTERFACE MINIZ_NO_ZLIB_COMPATIBLE_NAMES)
 #target_compile_definitions(miniz PRIVATE _LARGEFILE64_SOURCE)
 target_include_directories(miniz INTERFACE miniz)
 
@@ -51,6 +51,22 @@ target_compile_definitions(lodepng INTERFACE
 target_include_directories(lodepng INTERFACE lodepng)
 target_link_libraries(lodepng PRIVATE miniz)
 
+# mg
+
+add_library(mg STATIC
+	mg/assetsys.cpp
+	mg/assetsys.h
+	mg/strpool.cpp
+	mg/strpool.h
+)
+#target_compile_definitions(mg INTERFACE
+#	ASSETSYS_U64 uint64_t
+#	STRPOOL_U32 uint32_t
+#	STRPOOL_U64 uint64_t
+#)
+target_include_directories(mg INTERFACE mg)
+target_link_libraries(mg PRIVATE miniz)
+
 if(ANDROID)
 	include(FetchContent)
 

diff --git a/ext/mg/assetsys.cpp b/ext/mg/assetsys.cpp
@@ -0,0 +1,2 @@
+#define ASSETSYS_IMPLEMENTATION
+#include "assetsys.h"
diff --git a/ext/mg/assetsys.h b/ext/mg/assetsys.h
diff --git a/ext/mg/strpool.cpp b/ext/mg/strpool.cpp
@@ -0,0 +1,2 @@
+#define STRPOOL_IMPLEMENTATION
+#include "strpool.h"
diff --git a/ext/mg/strpool.h b/ext/mg/strpool.h
diff --git a/ext/miniz/miniz.h b/ext/miniz/miniz.h
@@ -115,9 +115,12 @@
 */
 #pragma once
 
-// OpenJazz modification
-#ifndef MINIZ_NO_ARCHIVE_APIS
-#define MINIZ_NO_ARCHIVE_APIS
+// OpenJazz Modification
+#ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES
+#  define MINIZ_NO_ZLIB_COMPATIBLE_NAMES
+#endif
+#if WORDS_BIGENDIAN==1
+#  define MINIZ_LITTLE_ENDIAN 0
 #endif
 #if defined(__3DS__) || defined(__wii__)
 #  define OJ_NO_LARGE_FILE

diff --git a/src/game/game.h b/src/game/game.h
@@ -159,7 +159,7 @@ class ServerGame : public Game {
 		unsigned char  recvBuffers[MAX_CLIENTS][BUFFER_LENGTH]; ///< Array of buffers containing data received from clients
 		int            received[MAX_CLIENTS]; ///< Array containing the amount of data received from each client
 		unsigned char *levelData; ///< Contents of the current level file
-		int            levelSize; ///< Size of the current level file
+		size_t         levelSize; ///< Size of the current level file
 		int            sock; ///< Server socket
 
 	public:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#define ASSETSYS_IMPLEMENTATION
		#include "assetsys.h"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#define STRPOOL_IMPLEMENTATION
		#include "strpool.h"