CMakeLists for each C file

CMakeLists.txt

@@ -7,13 +7,11 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # Set some global flags
 add_compile_definitions(
   _CRT_SECURE_NO_WARNINGS=1
-  ASSET_PREFIX="../assets/"
+  ASSET_PREFIX="assets/"
 )
 
 # Do initial set up depending on the build target type.
@@ -37,6 +35,15 @@ set(ASSETS_SOURCE_DIR "${ROOT_DIR}/assets")
 set(ASSETS_BUILD_DIR "${BUILD_DIR}/assets")
 set(TEMP_DIR "${BUILD_DIR}/temp")
 
+# Add global sources.
+add_subdirectory(lib)
+
+# Setup Platform specific libraries
+set(LIBS_PLATFORM "")
+if(NOT WIN32)
+  list(APPEND LIBS_PLATFORM m)
+endif()
+
 # Include tools
 add_subdirectory(tools)
 
@@ -47,8 +54,6 @@ elseif(TARGET_TYPE STREQUAL game)
   add_subdirectory(client)
 endif()
 
-# Add global sources.
-add_subdirectory(lib)
 
 # Set up shared assets
 tool_copy(shader_textured

client/CMakeLists.txt

@@ -3,4 +3,5 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
+
 add_subdirectory(glfwclient)

client/glfwclient/CMakeLists.txt

@@ -17,14 +17,9 @@ target_link_libraries(${PROJECT_NAME}
     glad
 )
 
-# Sources
-file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
-file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-
 target_sources(${PROJECT_NAME}
   PRIVATE
-    ${SOURCES}
-    ${HEADERS}
+    glfwclient.c
 )
 
 # Includes

client/glfwclient/glfwclient.h

@@ -6,7 +6,7 @@
 #pragma once
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
-#include "libs.h"
+#include <libs.h>
 #include "display/render.h"
 #include "input/input.h"
 #include "game/game.h"

lib/CMakeLists.txt

@@ -10,6 +10,5 @@ add_subdirectory(duktape)
 add_subdirectory(glad)
 
 # STB
-file(GLOB_RECURSE STB_SOURCES stb/*.h)
 add_library(stb INTERFACE)
 target_include_directories(stb INTERFACE stb)

src/CMakeLists.txt

@@ -6,30 +6,38 @@
 # Dawn Libraries
 target_link_libraries(${PROJECT_NAME}
   PUBLIC
+    ${LIBS_PLATFORM}
     glad
     cglm
     stb
     duktape
 )
 
+target_include_directories(${PROJECT_NAME}
+  PRIVATE
+    ${LIBS_PLATFORM}
+)
+
+# Source H files
 target_include_directories(${PROJECT_NAME}
   PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
-# Dawn Sources
-file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c(pp|xx))
-file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h(pp|xx))
-
-# Exclude Game Sources
-list(FILTER SOURCES EXCLUDE REGEX ".*games\\/.*")
-list(FILTER HEADERS EXCLUDE REGEX ".*games\\/.*")
-
-target_sources(${PROJECT_NAME}
-  PRIVATE
-    ${SOURCES}
-    ${HEADERS}
-)
+# Add in each part of the engine.
+add_subdirectory(display)
+add_subdirectory(engine)
+add_subdirectory(epoch)
+add_subdirectory(file)
+add_subdirectory(input)
+add_subdirectory(locale)
+add_subdirectory(physics)
+add_subdirectory(poker)
+add_subdirectory(save)
+add_subdirectory(scene)
+add_subdirectory(ui)
+add_subdirectory(util)
+add_subdirectory(vn)
 
 # Add Game Sources
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/games/${TARGET_GAME})

src/display/CMakeLists.txt

@@ -0,0 +1,24 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    bitmapfont.c
+    camera.c
+    font.c
+    framebuffer.c
+    matrix.c
+    render.c
+    renderlist.c
+    shader.c
+    spritebatch.c
+    texture.c
+    tileset.c
+)
+
+# Subdirs
+add_subdirectory(animation)
+add_subdirectory(primitive)

src/display/animation/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    animation.c
+    easing.c
+    queue.c
+    timeline.c
+)

src/display/primitive/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    cube.c
+    primitive.c
+    quad.c
+    skywall.c
+)

src/display/renderlist.h

@@ -86,11 +86,8 @@ renderpass_t * renderListRenderPass(
  * 
  * @param list List to render.
  * @param shader Shader to use while rendering.
- * @param uniforms Uniforms for the render list. [ view, proj, model, ...text ]
  */
-void renderListRender(
-  renderlist_t *list, shader_t *shader, shaderuniform_t *uniforms
-);
+void renderListRender(renderlist_t *list, shader_t *shader);
 
 /**
  * Takes a previously rendered render list and renders it to the backbuffer. 

src/engine/CMakeLists.txt

@@ -0,0 +1,12 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    client.c
+    engine.c
+    thread.c
+)

src/epoch/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    epoch.c
+)

src/file/CMakeLists.txt

@@ -0,0 +1,16 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    asset.c
+    assetmanager.c
+    csv.c
+    xml.c
+)
+
+# Subdirs
+add_subdirectory(loaders)

src/file/loaders/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    font.c
+    item.c
+    scaledtexture.c
+    shader.c
+    texture.c
+)

src/input/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    input.c
+)

src/libs.h

@@ -36,6 +36,7 @@
   // Unix Fixes
   #include <unistd.h>
   #include <pthread.h>
+  #include <errno.h>
 
   typedef pthread_t threadhandle_t;
   #define sysThreadCreate(mthd,otp,usr) pthread_create(&otp,NULL,mthd,usr)

src/locale/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    language.c
+)

src/physics/CMakeLists.txt

@@ -0,0 +1,12 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    aabb.c
+    sphere.c
+    vector.c
+)

src/poker/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    bet.c
+    card.c
+    dealer.c
+    player.c
+    poker.c
+    pot.c
+    turn.c
+    winner.c
+)

src/save/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    save.c
+)

src/scene/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    scene.c
+)

src/ui/CMakeLists.txt

@@ -0,0 +1,19 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    align.c
+    breakpoint.c
+    frame.c
+    framedtextmenu.c
+    grid.c
+    image.c
+    label.c
+    menu.c
+    rectangle.c
+    textmenu.c
+)

src/util/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    array.c
+    dictionary.c
+    dynarray.c
+    list.c
+    mem.c
+    string.c
+)

src/vn/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    vncharacter.c
+    vnscene.c
+)
+
+# Subdirs
+add_subdirectory(conversation)
+add_subdirectory(ui)

src/vn/conversation/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    talk.c
+    vnconversation.c
+)

src/vn/ui/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    vntextbox.c
+)

tools/display/CMakeLists.txt

@@ -24,6 +24,10 @@ target_link_libraries(texture_generation
   PUBLIC
     stb
 )
+target_link_libraries(texture_generation
+  PRIVATE
+    ${LIBS_PLATFORM}
+)
 
 # Function for creating the target
 function(tool_texture target in out)

tools/file/CMakeLists.txt

@@ -5,7 +5,8 @@
 
 function(tool_assets args)
   add_custom_target(assets
-    COMMAND tar -C ${ASSETS_BUILD_DIR} -czvf assets.tar.gz *
+    # COMMAND tar -C ${ASSETS_BUILD_DIR} -czvf assets.tar.gz *
+    COMMAND echo ${ASSETS_BUILD_DIR}
     DEPENDS ${ARGV}
     COMMENT "Compressing Assets"
   )

tools/game/CMakeLists.txt

@@ -5,12 +5,8 @@ function(tool_game name version)
   )
 
   file(WRITE ${TEMP_DIR}/dawn/game/game.h
-    "#include \"games/${TARGET_GAME}/game.h\""
+    "#pragma once\n#include <games/${TARGET_GAME}/game.h>"
   )
   
-  # target_sources(${PROJECT_NAME}
-  #   PRIVATE
-  #     ${TEMP_DIR}/dawn/game/game.h
-  # )
   target_include_directories(${PROJECT_NAME} PUBLIC ${TEMP_DIR}/dawn)
 endfunction()

tools/utils/file.c

@@ -29,7 +29,7 @@ void fileMkdirp(char *path) {
   while(c = path[i]) {
     if((c == '\\' || c == '/') && i > 0) {
       buffer[i] = '\0';
-      _mkdir(buffer);
+      fileMkdir(buffer, 0755);
       inFile = false;
       hasMore = false;
       buffer[i] = FILE_PATH_SEP;
@@ -45,7 +45,7 @@ void fileMkdirp(char *path) {
 
   if(!inFile && hasMore) {
     buffer[i] = '\0';
-    _mkdir(buffer);
+    fileMkdir(buffer, 0755);
   }
 }
 
@@ -117,5 +117,32 @@ bool fileListChildren(
     *count = i;
     return true;
   #else
+    struct dirent *de;
+    DIR *dr;
+    int32_t i;
+
+    // Open Dir
+    dr = opendir(directory);
+    if(dr == NULL) {
+      printf("Could not open directory");
+      return false;
+    }
+
+
+    // Iterate
+    i = 0;
+    while ((de = readdir(dr)) != NULL) {
+      // File or folder?
+      if(de->d_type != DT_REG) continue;
+
+      // Copy into child buffer
+      children[i] = buffer + (i * FILE_CHILD_NAME_MAX);
+      strcpy(children[i], de->d_name);
+      i++;
+    }
+    if(closedir(dr)) return false;
+  
+    *count = i;
+    return true;
   #endif
 }

tools/utils/file.h

@@ -18,9 +18,13 @@
   #include <windows.h>
   #define getcwd _getcwd
   #define FILE_PATH_SEP '\\'
+  #define fileMkdir(path, perms) _mkdir(path)
 #elif defined(__GNUC__)
   #include <unistd.h>
+  #include <dirent.h>
+  #include <sys/stat.h>
   #define FILE_PATH_SEP '/'
+  #define fileMkdir(path, perms) mkdir(path, perms)
 #endif
 
 void fileNormalizeSlashes(char *string);

tools/vn/CMakeLists.txt

@@ -25,6 +25,10 @@ target_link_libraries(character_generator
   PUBLIC
     stb
 )
+target_link_libraries(character_generator
+  PRIVATE
+    ${LIBS_PLATFORM}
+)
 
 # Function Target
 function(tool_vn_character target in out)