Moved all defs into main file.

2026-02-17 11:33:00 -06:00
parent 8b49902bf6
commit d0a057e0ee
8 changed files with 58 additions and 108 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,10 +38,9 @@ file(MAKE_DIRECTORY ${DUSK_GENERATED_HEADERS_DIR})
 # Find packages
 find_package(Python3 COMPONENTS Interpreter REQUIRED)

-# Set target system
+# Set target system, default to linux if not set.
 if(NOT DEFINED DUSK_TARGET_SYSTEM)
  set(DUSK_TARGET_SYSTEM "linux")
-  # set(DUSK_TARGET_SYSTEM "psp")
 endif()

 # Toolchains
@@ -82,13 +81,11 @@ endif()
 # Add tools
 add_subdirectory(tools)

-# Assets
-# add_subdirectory(assets)
-
-# Add libraries
+# Per Target Libraries and definitions
 if(DUSK_TARGET_SYSTEM STREQUAL "linux")
  find_package(SDL2 REQUIRED)
  find_package(OpenGL REQUIRED)
+
  target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC 
    SDL2
    pthread
@@ -97,9 +94,25 @@ if(DUSK_TARGET_SYSTEM STREQUAL "linux")
    m
  )

+  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
+    PUBLIC
+      DISPLAY_SDL2=1
+      DISPLAY_WINDOW_WIDTH_DEFAULT=1080
+      DISPLAY_WINDOW_HEIGHT_DEFAULT=810
+      DISPLAY_SCREEN_HEIGHT_DEFAULT=270
+      INPUT_SDL2=1
+      INPUT_KEYBOARD=1
+      INPUT_POINTER=1
+      INPUT_GAMEPAD=1
+      THREAD_PTHREAD=1
+      TIME_SDL2=1
+      TIME_FIXED=0
+  )
+
 elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
  find_package(SDL2 REQUIRED)
  find_package(OpenGL REQUIRED)
+
  target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
    ${SDL2_LIBRARIES}
    SDL2
@@ -113,10 +126,25 @@ elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
    lzma
    m
  )
+  
  target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PRIVATE
    ${SDL2_INCLUDE_DIRS}
  )

+  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
+    PUBLIC
+      DISPLAY_SDL2=1
+      DISPLAY_WINDOW_WIDTH_DEFAULT=480
+      DISPLAY_WINDOW_HEIGHT_DEFAULT=272
+      DISPLAY_WIDTH=480
+      DISPLAY_HEIGHT=272
+      DISPLAY_SIZE_DYNAMIC=0
+      INPUT_SDL2=1
+      INPUT_GAMEPAD=1
+      THREAD_PTHREAD=1
+      TIME_FIXED=1
+  )
+
 elseif(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions")
  # configure_file(opengl.pc.in opengl.pc @ONLY)
@@ -162,14 +190,28 @@ elseif(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wi
    fat
    PkgConfig::zip
  )
-endif()

-# Force turn tests off for now
-set(ENABLE_TESTS OFF CACHE BOOL "Enable tests" FORCE)
+  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
+    PUBLIC
+      DISPLAY_WINDOW_WIDTH_DEFAULT=640
+      DISPLAY_WINDOW_HEIGHT_DEFAULT=480
+      DISPLAY_WIDTH=640
+      DISPLAY_HEIGHT=480
+      DISPLAY_SIZE_DYNAMIC=0
+      INPUT_GAMEPAD=1
+      THREAD_PTHREAD=1
+      TIME_FIXED=1
+  )
+endif()

 # Add code
 add_subdirectory(${DUSK_SOURCES_DIR})

+# Include generated headers
+target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
+  ${DUSK_GENERATED_HEADERS_DIR}
+)
+
 # Handle tests
 if(ENABLE_TESTS)
  enable_testing()
@@ -190,11 +232,6 @@ add_custom_command(
 add_custom_target(DUSK_ASSETS_BUILT DEPENDS "${DUSK_ASSETS_ZIP}")
 add_dependencies(${DUSK_LIBRARY_TARGET_NAME} DUSK_ASSETS_BUILT)

-# Include generated headers
-target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
-  ${DUSK_GENERATED_HEADERS_DIR}
-)
-
 # Postbuild
 if(DUSK_TARGET_SYSTEM STREQUAL "psp")
  create_pbp_file(
--- a/src/debug/CMakeLists.txt
+++ b/src/debug/CMakeLists.txt
@@ -8,5 +8,3 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
  PUBLIC
    debug.c
 )
-
-# Subdirs
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -18,35 +18,7 @@ add_subdirectory(camera)
 add_subdirectory(mesh)
 add_subdirectory(texture)

-if(DUSK_TARGET_SYSTEM STREQUAL "linux")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      DISPLAY_SDL2=1
-      DISPLAY_WINDOW_WIDTH_DEFAULT=1080
-      DISPLAY_WINDOW_HEIGHT_DEFAULT=810
-      DISPLAY_SCREEN_HEIGHT_DEFAULT=270
-  )
-elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      DISPLAY_SDL2=1
-      DISPLAY_WINDOW_WIDTH_DEFAULT=480
-      DISPLAY_WINDOW_HEIGHT_DEFAULT=272
-      DISPLAY_WIDTH=480
-      DISPLAY_HEIGHT=272
-      DISPLAY_SIZE_DYNAMIC=0
-  )
-elseif(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      DISPLAY_WINDOW_WIDTH_DEFAULT=640
-      DISPLAY_WINDOW_HEIGHT_DEFAULT=480
-      DISPLAY_WIDTH=640
-      DISPLAY_HEIGHT=480
-      DISPLAY_SIZE_DYNAMIC=0
-  )
-endif()
-
+# Color definitions
 dusk_run_python(
  dusk_color_defs
  tools.display.color.csv
--- a/src/input/CMakeLists.txt
+++ b/src/input/CMakeLists.txt
@@ -11,30 +11,7 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
    inputaction.c
 )

-if(DUSK_TARGET_SYSTEM STREQUAL "linux")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      INPUT_SDL2=1
-      INPUT_KEYBOARD=1
-      INPUT_POINTER=1
-      INPUT_GAMEPAD=1
-  )
-
-elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      INPUT_SDL2=1
-      INPUT_GAMEPAD=1
-  )
-  
-elseif(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      INPUT_GAMEPAD=1
-  )
-endif()
-
-# CSV
+# Input Action Definitions
 dusk_run_python(
  dusk_input_csv_defs
  tools.input.csv
--- a/src/item/CMakeLists.txt
+++ b/src/item/CMakeLists.txt
@@ -10,6 +10,7 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
    backpack.c
 )

+# Item Definitions
 dusk_run_python(
  dusk_item_csv_defs
  tools.item.csv
--- a/src/story/CMakeLists.txt
+++ b/src/story/CMakeLists.txt
@@ -9,6 +9,7 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
    storyflag.c
 )

+# Story Flag Definitions
 dusk_run_python(
  dusk_story_defs
  tools.story.csv
--- a/src/thread/CMakeLists.txt
+++ b/src/thread/CMakeLists.txt
@@ -9,20 +9,3 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
    thread.c
    threadmutex.c
 )
-
-# Compiler flags.
-if(DUSK_TARGET_SYSTEM STREQUAL "linux")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      THREAD_PTHREAD=1
-  )
-elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      THREAD_PTHREAD=1
-  )
-elseif(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-  )
-endif()
--- a/src/time/CMakeLists.txt
+++ b/src/time/CMakeLists.txt
@@ -8,22 +8,3 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
  PUBLIC
    time.c
 )
-
-# Compiler defs
-if(DUSK_TARGET_SYSTEM STREQUAL "linux")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      TIME_SDL2=1
-      TIME_FIXED=0
-  )
-elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      TIME_FIXED=1
-  )
-elseif(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-    PUBLIC
-      TIME_FIXED=1
-  )
-endif()