Browse Source

Use new export feature to clean up code

master
Macoy Madson 1 month ago
parent
commit
f52c98e463
  1. 2
      Dependencies/cakelisp
  2. 2
      Dependencies/gamelib
  3. 3
      src/Export.cake
  4. 10
      src/FileHelper.cake
  5. 7
      src/ImGuiAutoColor.cake
  6. 2
      src/Time.cake
  7. 7
      src/TreemapFileSystem.cake
  8. 3
      src/TreemapOpenGL.cake

2
Dependencies/cakelisp

@ -1 +1 @@
Subproject commit b838c01c856d87c4219be5fd942fe6f7d6203312
Subproject commit 793ebbbfbc57580115cda8646b7fefc330408993

2
Dependencies/gamelib

@ -1 +1 @@
Subproject commit 2385bd0263c6831ea4cce2456682c4845b2b03c2
Subproject commit 12652b79c7a7b784ff8b77e8d6dd1cd2c07cc8dd

3
src/Export.cake

@ -5,9 +5,6 @@
"Utilities.cake"
&comptime-only "CHelpers.cake")
;; TODO Need infect
(add-c-search-directory-module "Dependencies/enkiTS/src")
(c-import "<stdio.h>" "<assert.h>")
(forward-declare (struct directory-entry-userdata)

10
src/FileHelper.cake

@ -19,15 +19,10 @@
"CHelpers.cake")
(c-import "SDL.h" "SDL_syswm.h" "SDL_timer.h" "<stdio.h>")
;; TODO: Somehow inherit this from SDL.cake?
(module-use-sdl-build-options)
(imgui-use-sdl-gl3)
(comptime-cond
('Profile
(import "Tracy.cake")
(module-use-tracy-build-options))
(import "Tracy.cake"))
(true
(import "ProfilerNull.cake")))
@ -1244,9 +1239,6 @@
(while (not (IsDebuggerPresent))
(Sleep 100)))))
;; TODO Need infect
(add-c-search-directory-module "Dependencies/enkiTS/src")
(make-imgui-sdl-gl3-application
file-helper
"File Helper"

7
src/ImGuiAutoColor.cake

@ -3,12 +3,7 @@
"Time.cake"
&comptime-only "CHelpers.cake")
;; TODO Need infect
(add-c-search-directory-module "Dependencies/enkiTS/src")
;; TODO: ImGui.cake import should handle this via export/auto-infect
(c-import "imgui.h" "<stdlib.h>" "<stdio.h>" "<math.h>")
(add-c-search-directory-module "Dependencies/imgui")
(c-import "<stdlib.h>" "<stdio.h>" "<math.h>")
(var target-base16-colors ([] 16 auto-color))

2
src/Time.cake

@ -1,8 +1,6 @@
(import "SDL.cake")
(c-import "SDL.h" "SDL_syswm.h" "SDL_timer.h")
(module-use-sdl-build-options)
(var startup-num-perf-ticks Uint64 0)
(defun set-startup-time-now ()

7
src/TreemapFileSystem.cake

@ -5,8 +5,7 @@
(comptime-cond
('Profile
(import "Tracy.cake")
(module-use-tracy-build-options))
(import "Tracy.cake"))
(true
(import "ProfilerNull.cake")))
@ -16,10 +15,6 @@
;; For Uint64
&with-decls "SDL_stdinc.h")
;; TODO Need infect
(module-use-sdl-build-options)
(add-c-search-directory-module "Dependencies/enkiTS/src")
(forward-declare (struct treemap-file-system-multithreaded-state))
(defstruct-local treemap-directory

3
src/TreemapOpenGL.cake

@ -13,8 +13,7 @@
(comptime-cond
('Profile
(import "Tracy.cake")
(module-use-tracy-build-options))
(import "Tracy.cake"))
(true
(import "ProfilerNull.cake")))

Loading…
Cancel
Save