fix: use wrapped s4c.h inclusion in palette

Author: jgabaut

s4c/core/palette.py

@@ -34,10 +34,11 @@
 import sys
 import os
 from .utils import convert_mode_lit
+from .utils import print_wrapped_s4c_inclusion
 
 ## The file format version.
-FILE_VERSION = "0.2.2"
-SCRIPT_VERSION = "0.1.2"
+FILE_VERSION = "0.2.3"
+SCRIPT_VERSION = "0.1.3"
 F_STRING_ARGS = "[--cfile-no-include] <mode> <palette> <s4c path>"
 
 # Expects the palette name as first argument, output directory as second argument.
@@ -108,8 +109,8 @@ def convert_palette(mode, palette_path, s4c_path, *args):
 
     if mode == "header":
         print(f"#ifndef {target_name.upper()}_S4C_H_")
-        print(f"#define {target_name.upper()}_S4C_H_")
-        print(f"#include \"{s4c_path}/sprites4curses/src/s4c.h\"\n")
+        print(f"#define {target_name.upper()}_S4C_H_\n")
+        print_wrapped_s4c_inclusion(s4c_path)
         print(f"#define {target_name.upper()}_S4C_H_VERSION \"{FILE_VERSION}\"")
         print(f"#define {target_name.upper()}_S4C_H_TOTCOLORS {read_colors}")
         print("\n/**")

s4c/core/utils.py

@@ -60,7 +60,7 @@ def convert_mode_lit(mode):
     return "INVALID"
 
 def print_animation_header(target_name, file_version):
-    """! Print the beginning of s4c header for a target."""
+    """! Print the beginning of animation header for a target."""
     print(f"#ifndef {target_name.upper()}_S4C_H_")
     print(f"#define {target_name.upper()}_S4C_H_")
     print(f"#define {target_name.upper()}_S4C_H_VERSION \"{file_version}\"")
@@ -69,8 +69,20 @@ def print_animation_header(target_name, file_version):
     print(f" * Declares animation matrix vector for {target_name}.")
     print(" */")
 
+def print_wrapped_s4c_inclusion(s4c_path):
+    """! Print the wrapped s4c.h inclusion."""
+    print("#ifndef S4C_HAS_ANIMATE")
+    print("#define S4C_SCRIPTS_PALETTE_ANIMATE_CLEANUP")
+    print("#define S4C_HAS_ANIMATE")
+    print("#endif //!S4C_HAS_ANIMATE")
+    print(f"#include \"{s4c_path}/sprites4curses/src/s4c.h\"")
+    print("#ifdef PALETTE_ANIMATE_CLEANUP")
+    print("#undef S4C_HAS_ANIMATE")
+    print("#undef S4C_SCRIPTS_PALETTE_ANIMATE_CLEANUP")
+    print("#endif //PALETTE_ANIMATE_CLEANUP\n")
+
 def print_heading(mode, target_name, file_version, num_frames, s4c_path):
-    """! Print the actual s4c header for a target."""
+    """! Print the actual header for a target."""
     if mode == "s4c":
         print(f"{file_version}")
     elif mode == "header":
@@ -82,8 +94,8 @@ def print_heading(mode, target_name, file_version, num_frames, s4c_path):
     elif mode == "header-exp":
         print_animation_header(target_name, file_version)
         #s4c_path = args[0]
+        print_wrapped_s4c_inclusion(s4c_path)
         print(f"extern S4C_Sprite {target_name}[{num_frames}];\n")
-        print(f"#include \"{s4c_path}/sprites4curses/src/s4c.h\"\n")
         print(f"\n#endif // {target_name.upper()}_S4C_H_")
         return True
     elif mode in ('cfile', 'cfile-exp'):

s4c/s4c_cli.py

@@ -42,7 +42,7 @@
 from .core.sheet_converter import main as sheet_converter_main
 from .core.png_resize import main as png_resize_main
 
-S4C_CLI_VERSION = "0.1.3"
+S4C_CLI_VERSION = "0.1.4"
 
 EXPECTED_S4C_ANIMATE_V = "0.4.8"