Fix #2

Author: mupfdev

CMakeLists.txt

@@ -16,7 +16,9 @@ if (NGAGESDK)
 else()
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXPORT_DIR})
   include(get_SDL3)
+  include(get_zlib)
   get_SDL3("3.2.16")
+  get_zlib("1.3.1")
 endif()
 
 # Game source files.
@@ -34,7 +36,7 @@ set(kagekero_sources
   src/utils.c
 )
 
-add_executable(kagekero WIN32 ${kagekero_sources})
+add_executable(kagekero ${kagekero_sources})
 target_compile_definitions(kagekero PRIVATE
     $<$<CONFIG:Debug>:DEBUG>
 )
@@ -126,19 +128,21 @@ if(PACK_ASSETS)
     endif()
   endif()
 
-  if(NGAGESDK)
-    set(MAP_PREFIX ".gz")
-    function(compress_maps asset_dir)
-      add_custom_target(001.tmj.gz ALL
-        WORKING_DIRECTORY ${asset_dir}
-        COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/gzip -k -f *.tmj
-      )
-    endfunction()
-  endif()
+  function(compress_maps asset_dir)
+    find_program(GZIP_EXECUTABLE gzip PATHS ${CMAKE_CURRENT_SOURCE_DIR}/tools NO_DEFAULT_PATH)
+    if(NOT GZIP_EXECUTABLE)
+      find_program(GZIP_EXECUTABLE gzip)
+    endif()
+
+    add_custom_target(001.tmj.gz ALL
+      WORKING_DIRECTORY ${asset_dir}
+      COMMAND ${GZIP_EXECUTABLE} -k -f *.tmj
+    )
+  endfunction()
 
   set(BASE_ASSETS
-    001.tmj${MAP_PREFIX}
-    002.tmj${MAP_PREFIX}
+    001.tmj.gz
+    002.tmj.gz
     font.png
     frame.png
     frame_400x240.png
@@ -151,25 +155,21 @@ if(PACK_ASSETS)
   if(BUILD_FULL_VERSION)
     set(ASSET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/full-assets")
 
-    if(NGAGESDK)
-      compress_maps("${ASSET_DIR}")
-    endif()
+    compress_maps("${ASSET_DIR}")
 
     set(ASSET_LIST
       "${BASE_ASSETS}"
-      003.tmj${MAP_PREFIX}
-      004.tmj${MAP_PREFIX}
-      005.tmj${MAP_PREFIX}
-      006.tmj${MAP_PREFIX}
-      007.tmj${MAP_PREFIX}
+      003.tmj.gz
+      004.tmj.gz
+      005.tmj.gz
+      006.tmj.gz
+      007.tmj.gz
     )
   else()
 
     set(ASSET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
 
-    if(NGAGESDK)
-      compress_maps("${ASSET_DIR}")
-    endif()
+    compress_maps("${ASSET_DIR}")
 
     set(ASSET_LIST ${BASE_ASSETS})
   endif()
@@ -187,7 +187,7 @@ if(PACK_ASSETS)
 endif()
 
 if(UNIX)
-  target_link_libraries(kagekero PRIVATE ${SDL3_LIBRARIES} m)
+  target_link_libraries(kagekero PRIVATE ${SDL3_LIBRARIES} ${ZLIB_LIBRARIES} m)
 
   if(PACK_ASSETS)
     add_executable(packer tools/packer.cpp)
@@ -196,7 +196,7 @@ if(UNIX)
     )
   endif()
 else()
-  target_link_libraries(kagekero PRIVATE ${SDL3_LIBRARIES})
+  target_link_libraries(kagekero PRIVATE ${SDL3_LIBRARIES} ${ZLIB_LIBRARIES})
 endif()
 
 # Dreamcast-specific setup.

cmake/get_zlib.cmake

@@ -0,0 +1,15 @@
+macro(get_zlib version)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
+    cmake_policy(SET CMP0135 NEW)
+  endif()
+  include(FetchContent)
+  FetchContent_Declare(
+    zlib
+    URL https://zlib.net/zlib-${version}.tar.gz
+    URL_HASH
+      SHA256=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
+  )
+  FetchContent_MakeAvailable(zlib)
+
+ set(ZLIB_LIBRARIES zlib)
+endmacro(get_zlib)

export/data.pfs

@@ -31,7 +31,6 @@
 #if defined DEBUG
 // Default configuration.
 #elif defined __SYMBIAN32__
-#define MAP_PREFIX      ".gz"
 #define WINDOW_W        176
 #define WINDOW_H        208
 #define SCREEN_OFFSET_X 0
@@ -84,10 +83,6 @@
 #define FRAME_OFFSET_Y 0
 #endif
 
-#ifndef MAP_PREFIX
-#define MAP_PREFIX ""
-#endif
-
 #ifndef SCALE
 #define SCALE 1
 #endif

src/config.h

@@ -97,7 +97,7 @@ bool init(core_t **nc)
     init_file_reader();
 
     char first_map[11] = { 0 };
-    SDL_snprintf(first_map, 11, "%03d.tmj%s", FIRST_LEVEL, MAP_PREFIX);
+    SDL_snprintf(first_map, 11, "%03d.tmj.gz", FIRST_LEVEL);
     if (!load_map(first_map, &(*nc)->map, (*nc)->renderer))
     {
         return false;

src/core.c

@@ -115,7 +115,7 @@ static void handle_interaction(kero_t *kero, map_t *map, unsigned int *btn, SDL_
                     char next_map[11] = { 0 };
                     kero->level += 1;
 
-                    SDL_snprintf(next_map, 11, "%03d.tmj%s", kero->level, MAP_PREFIX);
+                    SDL_snprintf(next_map, 11, "%03d.tmj.gz", kero->level);
                     if (!load_map(next_map, &map, renderer))
                     {
                         SDL_Log("Failed to load next map: %s", next_map);

src/kero.c

@@ -15,9 +15,7 @@
 #include "pfs.h"
 #include "utils.h"
 
-#if defined __SYMBIAN32__
 #include "zlib.h"
-#endif
 
 #if defined __SYMBIAN32__
 #define CUTE_TILED_SNPRINTF(ARGS...) (void)(ARGS)
@@ -52,7 +50,6 @@ static void destroy_tiled_map(map_t *map)
     map->handle = NULL;
 }
 
-#if defined __SYMBIAN32__
 static bool decompress_gz_buffer(Uint8 *compressed_data, size_t compressed_size, Uint8 **out_decompressed_data, uLongf *out_decompressed_size)
 {
     const size_t CHUNK_SIZE = 16384;
@@ -109,7 +106,6 @@ static bool decompress_gz_buffer(Uint8 *compressed_data, size_t compressed_size,
 
     return true;
 }
-#endif
 
 static bool load_tiled_map(const char *file_name, map_t *map)
 {
@@ -128,13 +124,11 @@ static bool load_tiled_map(const char *file_name, map_t *map)
     }
 
     int buffer_size = 0;
-#if defined __SYMBIAN32__
     Uint8 *decompressed_data = NULL;
     uLongf decompressed_size = 0;
 
     if (decompress_gz_buffer(buffer, size_of_file(file_name), &decompressed_data, &decompressed_size))
     {
-        // Success � `decompressed_data` contains result, size in `decompressed_size`
         SDL_Log("Decompressed to %lu bytes", decompressed_size);
         SDL_free(buffer); // free original .gz buffer
         buffer = decompressed_data;
@@ -144,9 +138,6 @@ static bool load_tiled_map(const char *file_name, map_t *map)
     {
         SDL_Log("Decompression failed");
     }
-#else
-    buffer_size = size_of_file(file_name);
-#endif
 
     map->handle = cute_tiled_load_map_from_memory((const void *)buffer, buffer_size, NULL);
     if (!map->handle)