Browse Source

Update Cakelisp for build configuration fixes

These make it possible to build hot-reloading things alongside regular
things without causing any unnecessary rebuilds.
pitch-detection
Macoy Madson 3 years ago
parent
commit
7f87a6714d
  1. 6
      Build_Debug.sh
  2. 2
      Dependencies/cakelisp
  3. 2
      src/AutoTest.cake
  4. 6
      test/src/MakeHotReload.cake

6
Build_Debug.sh

@ -13,6 +13,12 @@ echo "\n\nSDL Ogre\n\n"
./Dependencies/cakelisp/bin/cakelisp --verbose-file-system test/src/SDLOgreApp.cake || exit $?
echo "\n\nAuto Test\n\n"
./Dependencies/cakelisp/bin/cakelisp src/AutoTest.cake src/SDL.cake src/Tracy.cake || exit $?
echo "\n\nLoader\n\n"
./Dependencies/cakelisp/bin/cakelisp test/src/Loader.cake || exit $?
echo "\n\nVocal Game (hot reload)\n\n"
./Dependencies/cakelisp/bin/cakelisp test/src/MakeHotReload.cake test/src/VocalGame.cake || exit $?
echo "\n\nVocal Game (no reload)\n\n"
./Dependencies/cakelisp/bin/cakelisp test/src/NoHotReload.cake test/src/VocalGame.cake || exit $?
echo "\n\nRun Vocal Game\n\n"

2
Dependencies/cakelisp

@ -1 +1 @@
Subproject commit 62dff2b9c27ac285075a0e1fcb7832c960b6b7bb
Subproject commit 6b89e27a52cd2554a1337a13ee94cc7c3b8398b2

2
src/AutoTest.cake

@ -46,7 +46,7 @@
(for-in import-pair (& (<> std::pair (* (const char)) (* (const Token)))) required-imports
(var import-str Token (deref (field import-pair second)))
(set (field import-str type) TokenType_String)
(set (field import-str contents) (+ (std::string "../") (field import-pair first)))
(set (field import-str contents) (field import-pair first))
(tokenize-push (deref main-definition)
(import (token-splice-addr import-str))))

6
test/src/MakeHotReload.cake

@ -2,7 +2,7 @@
(set-cakelisp-option executable-output "test/libGeneratedCakelisp.so")
(import "Dependencies/cakelisp/runtime/HotReloadingCodeModifier.cake")
;; Include cakelisp source for DynamicLoader.hpp
(add-c-search-directory global "Dependencies/cakelisp/src")
;; Added so HotReloading.hpp can be found by every module in the hot-reloading library
(add-c-search-directory global "Dependencies/cakelisp/runtime")
(import "Dependencies/cakelisp/runtime/HotReloadingCodeModifier.cake")

Loading…
Cancel
Save