WIP: zip support

AlisterT · Apr 15, 2024 · dff59c0 · dff59c0
1 parent cf7489c
commit dff59c0
Show file tree

Hide file tree

Showing 9 changed files with 3,180 additions and 99 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -257,7 +257,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,6 @@ 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 PRIVATE _LARGEFILE64_SOURCE)
 target_include_directories(miniz INTERFACE miniz)
 
@@ -51,6 +50,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,11 +115,6 @@
 */
 #pragma once
 
-// OpenJazz modification
-#ifndef MINIZ_NO_ARCHIVE_APIS
-#define MINIZ_NO_ARCHIVE_APIS
-#endif
-
 /* Defines to completely disable specific portions of miniz.c: 
    If all macros here are defined the only functionality remaining will be CRC-32 and adler-32. */
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"