From 2c5dfe35c9ce9cb8901e46724a68fd46c5f1ab28 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 23 Dec 2023 14:41:39 -0600 Subject: [PATCH] Update liccor file for new project --- src/jasper/CMakeLists.txt | 9 ++++++++- src/jasper/modules/CMakeLists.txt | 2 +- src/jasper/modules/core/include/jasper/core/animpage.hpp | 2 +- src/jasper/modules/core/include/jasper/core/bootfile.hpp | 2 +- .../modules/core/include/jasper/core/keelmodule.hpp | 2 +- src/jasper/modules/core/src/keel/keelmodule.cpp | 2 +- src/jasper/modules/keelmodules.cpp | 2 +- src/jasper/modules/studiomodules.cpp | 2 +- src/jasper/modules/world/include/jasper/world/consts.hpp | 2 +- .../modules/world/include/jasper/world/keelmodule.hpp | 2 +- src/jasper/modules/world/include/jasper/world/prefab.hpp | 2 +- .../modules/world/include/jasper/world/studiomodule.hpp | 2 +- src/jasper/modules/world/include/jasper/world/world.hpp | 2 +- .../modules/world/include/jasper/world/worldstatic.hpp | 2 +- src/jasper/modules/world/src/CMakeLists.txt | 2 +- src/jasper/modules/world/src/keel/keelmodule.cpp | 2 +- src/jasper/modules/world/src/keel/typeconv.cpp | 2 +- src/jasper/modules/world/src/keel/typeconv.hpp | 2 +- src/jasper/modules/world/src/studio/studiomodule.cpp | 2 +- .../world/src/studio/worldeditor/worldeditor-imgui.cpp | 2 +- .../world/src/studio/worldeditor/worldeditor-imgui.hpp | 2 +- .../modules/world/src/studio/worldeditor/worldeditor.cpp | 2 +- .../modules/world/src/studio/worldeditor/worldeditor.hpp | 2 +- .../world/src/studio/worldeditor/worldeditorview.cpp | 2 +- .../world/src/studio/worldeditor/worldeditorview.hpp | 2 +- .../studio/worldobjecteditor/worldobjecteditor-imgui.cpp | 2 +- .../studio/worldobjecteditor/worldobjecteditor-imgui.hpp | 2 +- .../src/studio/worldobjecteditor/worldobjecteditor.cpp | 2 +- .../src/studio/worldobjecteditor/worldobjecteditor.hpp | 2 +- src/jasper/modules/world/src/world.cpp | 2 +- src/jasper/modules/world/src/worldstatic.cpp | 2 +- src/jasper/player/app.cpp | 2 +- 32 files changed, 39 insertions(+), 32 deletions(-) diff --git a/src/jasper/CMakeLists.txt b/src/jasper/CMakeLists.txt index 1488b18..ce6b9ad 100644 --- a/src/jasper/CMakeLists.txt +++ b/src/jasper/CMakeLists.txt @@ -1,6 +1,13 @@ #project packages +set(JASPER_BUILD_PLAYER ON CACHE BOOL "Build Player") +set(JASPER_BUILD_STUDIO ON CACHE BOOL "Build Studio") + +if(BUILDCORE_TARGET STREQUAL "gba") + set(JASPER_BUILD_STUDIO OFF) +endif() + if(APPLE) set(JASPER_DIST_BIN JasperStudio.app/Contents/MacOS) set(JASPER_DIST_LIB JasperStudio.app/Contents/Library) @@ -11,6 +18,6 @@ endif() add_subdirectory(modules) add_subdirectory(player) -if(TURBINE_BUILD_TYPE STREQUAL "Native") +if(NOT BUILDCORE_TARGET STREQUAL "gba") add_subdirectory(tools) endif() diff --git a/src/jasper/modules/CMakeLists.txt b/src/jasper/modules/CMakeLists.txt index 8724df6..b370909 100644 --- a/src/jasper/modules/CMakeLists.txt +++ b/src/jasper/modules/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries( ) # Studio -if(TURBINE_BUILD_TYPE STREQUAL "Native") +if(JASPER_BUILD_STUDIO) add_library( JasperStudioModules STATIC studiomodules.cpp diff --git a/src/jasper/modules/core/include/jasper/core/animpage.hpp b/src/jasper/modules/core/include/jasper/core/animpage.hpp index dc27109..7107c39 100644 --- a/src/jasper/modules/core/include/jasper/core/animpage.hpp +++ b/src/jasper/modules/core/include/jasper/core/animpage.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/core/include/jasper/core/bootfile.hpp b/src/jasper/modules/core/include/jasper/core/bootfile.hpp index 7e7e84e..8df285c 100644 --- a/src/jasper/modules/core/include/jasper/core/bootfile.hpp +++ b/src/jasper/modules/core/include/jasper/core/bootfile.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/core/include/jasper/core/keelmodule.hpp b/src/jasper/modules/core/include/jasper/core/keelmodule.hpp index 9440dad..d04c96e 100644 --- a/src/jasper/modules/core/include/jasper/core/keelmodule.hpp +++ b/src/jasper/modules/core/include/jasper/core/keelmodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/core/src/keel/keelmodule.cpp b/src/jasper/modules/core/src/keel/keelmodule.cpp index 805c861..75a7dbd 100644 --- a/src/jasper/modules/core/src/keel/keelmodule.cpp +++ b/src/jasper/modules/core/src/keel/keelmodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/keelmodules.cpp b/src/jasper/modules/keelmodules.cpp index b06e390..8ac011e 100644 --- a/src/jasper/modules/keelmodules.cpp +++ b/src/jasper/modules/keelmodules.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/studiomodules.cpp b/src/jasper/modules/studiomodules.cpp index 12865ca..e81edea 100644 --- a/src/jasper/modules/studiomodules.cpp +++ b/src/jasper/modules/studiomodules.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/include/jasper/world/consts.hpp b/src/jasper/modules/world/include/jasper/world/consts.hpp index ae922e1..a3a4e7e 100644 --- a/src/jasper/modules/world/include/jasper/world/consts.hpp +++ b/src/jasper/modules/world/include/jasper/world/consts.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/include/jasper/world/keelmodule.hpp b/src/jasper/modules/world/include/jasper/world/keelmodule.hpp index 7fba482..9a0303c 100644 --- a/src/jasper/modules/world/include/jasper/world/keelmodule.hpp +++ b/src/jasper/modules/world/include/jasper/world/keelmodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/include/jasper/world/prefab.hpp b/src/jasper/modules/world/include/jasper/world/prefab.hpp index 78188cd..2f57f1e 100644 --- a/src/jasper/modules/world/include/jasper/world/prefab.hpp +++ b/src/jasper/modules/world/include/jasper/world/prefab.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/include/jasper/world/studiomodule.hpp b/src/jasper/modules/world/include/jasper/world/studiomodule.hpp index 5720537..525f80e 100644 --- a/src/jasper/modules/world/include/jasper/world/studiomodule.hpp +++ b/src/jasper/modules/world/include/jasper/world/studiomodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/include/jasper/world/world.hpp b/src/jasper/modules/world/include/jasper/world/world.hpp index 006750d..d562f47 100644 --- a/src/jasper/modules/world/include/jasper/world/world.hpp +++ b/src/jasper/modules/world/include/jasper/world/world.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/include/jasper/world/worldstatic.hpp b/src/jasper/modules/world/include/jasper/world/worldstatic.hpp index bb257b4..63fa79a 100644 --- a/src/jasper/modules/world/include/jasper/world/worldstatic.hpp +++ b/src/jasper/modules/world/include/jasper/world/worldstatic.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/src/CMakeLists.txt b/src/jasper/modules/world/src/CMakeLists.txt index 73cd9e8..b1ce3f1 100644 --- a/src/jasper/modules/world/src/CMakeLists.txt +++ b/src/jasper/modules/world/src/CMakeLists.txt @@ -17,7 +17,7 @@ target_link_libraries( ) add_subdirectory(keel) -if(NOSTALGIA_BUILD_STUDIO) +if(JASPER_BUILD_STUDIO) add_subdirectory(studio) endif() diff --git a/src/jasper/modules/world/src/keel/keelmodule.cpp b/src/jasper/modules/world/src/keel/keelmodule.cpp index 72ce3a0..54626f3 100644 --- a/src/jasper/modules/world/src/keel/keelmodule.cpp +++ b/src/jasper/modules/world/src/keel/keelmodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/src/keel/typeconv.cpp b/src/jasper/modules/world/src/keel/typeconv.cpp index beeaa04..c81cfa5 100644 --- a/src/jasper/modules/world/src/keel/typeconv.cpp +++ b/src/jasper/modules/world/src/keel/typeconv.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/src/keel/typeconv.hpp b/src/jasper/modules/world/src/keel/typeconv.hpp index 9049ed4..ae39e56 100644 --- a/src/jasper/modules/world/src/keel/typeconv.hpp +++ b/src/jasper/modules/world/src/keel/typeconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/src/studio/studiomodule.cpp b/src/jasper/modules/world/src/studio/studiomodule.cpp index 7c7be07..50aa158 100644 --- a/src/jasper/modules/world/src/studio/studiomodule.cpp +++ b/src/jasper/modules/world/src/studio/studiomodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp index 31be91f..8fb1db8 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp index 1d36208..ee1df2f 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor.cpp index e3d4616..73f19cf 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor.hpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor.hpp index 7cbe5a0..da3a2f2 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor.hpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp index 4b8cfc5..6b2181e 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp index e9021da..2e90bc1 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor-imgui.cpp index afc9633..26b4420 100644 --- a/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor-imgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "worldobjecteditor-imgui.hpp" diff --git a/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor-imgui.hpp b/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor-imgui.hpp index 45e15f3..dca619b 100644 --- a/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor-imgui.hpp +++ b/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor-imgui.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor.cpp b/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor.cpp index d242c29..adbc824 100644 --- a/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor.cpp +++ b/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor.hpp b/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor.hpp index 4b23bfc..83eb0e5 100644 --- a/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor.hpp +++ b/src/jasper/modules/world/src/studio/worldobjecteditor/worldobjecteditor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/jasper/modules/world/src/world.cpp b/src/jasper/modules/world/src/world.cpp index b1402f8..c73cf1a 100644 --- a/src/jasper/modules/world/src/world.cpp +++ b/src/jasper/modules/world/src/world.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/modules/world/src/worldstatic.cpp b/src/jasper/modules/world/src/worldstatic.cpp index 8183207..397c646 100644 --- a/src/jasper/modules/world/src/worldstatic.cpp +++ b/src/jasper/modules/world/src/worldstatic.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/jasper/player/app.cpp b/src/jasper/player/app.cpp index 57b31af..7cfd058 100644 --- a/src/jasper/player/app.cpp +++ b/src/jasper/player/app.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include