From 910ebe9d0fafb041c71b19b3b8abe6c63dd583e7 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 29 Apr 2022 22:01:51 -0700 Subject: [PATCH] Add objects subdirectory For game object-specific code --- src/CMakeLists.txt | 1 + src/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1355c85ee..53eeb5248 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -302,6 +302,7 @@ target_compile_definitions(SRB2SDL2 PRIVATE -DCMAKECONFIG) #) add_subdirectory(sdl) +add_subdirectory(objects) if(${CMAKE_SYSTEM} MATCHES Windows) add_subdirectory(win32) diff --git a/src/Makefile b/src/Makefile index 9659a4994..ffec6a4cf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -208,6 +208,7 @@ objdir:=$(makedir)/objs sources+=\ $(call List,Sourcefile)\ $(call List,blua/Sourcefile)\ + $(call List,objects/Sourcefile)\ depends:=$(basename $(filter %.c %.s,$(sources))) objects:=$(basename $(filter %.c %.s %.nas,$(sources)))