riley/lbs
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Updated lbs to use new uniproc library

Browse Source 
Fixed bug in fs.list_alldirs where it used directory_iterator rather that recursive_directory_iterator
Fixed memory/type bugs in lua_platform.cpp
Updated lbs.lua to reflect this
This commit is contained in:
Riley King-Saunders
2025-03-06 19:27:19 +11:00
parent 40ea3caf2a
commit 68e2c49c8f
6 changed files with 80 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
makefile
View File

@@ -9,6 +9,7 @@ DEBUG_DEFINES :=
DEFINES :=
CXX_FLAGS := -std=c11 -std=c++20 -g -O0
CC_FLAGS := -std=c11 -g -O0
CXX_DEBUG_FLAGS :=
LNK_FLAGS := -g -O0
LNK_DEBUG_FLAGS :=
@@ -42,21 +43,24 @@ endif
clean:
$(call RM,$(call rwildcard, obj,*.o) build/$(OUTPUT_NAME))
SOURCE_FILES := $(call rwildcard,src,*.cpp,*.hpp) $(call rwildcard,thirdparty/uniproc/src,*.cpp,*.hpp)
SOURCE_FILES := $(call rwildcard,src,*.cpp,*.hpp) $(call rwildcard,thirdparty/uniproc/src,*.c)
OBJECT_FILES := $(foreach d,$(addsuffix .o,$(SOURCE_FILES)), obj/$(d))
obj/thirdparty/uniproc/%.c.o: thirdparty/uniproc/src/%.c
$(CC) -c $(CXX_FLAGS) $(foreach inc,$(INCLUDES),-I$(inc)) $(foreach def,$(DEFINES),-D$(def)) $< -o $@
obj/thirdparty/uniproc/src/%.c.o: thirdparty/uniproc/src/%.c
$(CC) -c $(CC_FLAGS) $(foreach inc,$(INCLUDES),-I$(inc)) $(foreach def,$(DEFINES),-D$(def)) $< -o $@
obj/src/%.cpp.o: src/%.cpp
$(CXX) -c $(CXX_FLAGS) $(foreach inc,$(INCLUDES),-I$(inc)) $(foreach def,$(DEFINES),-D$(def)) $< -o $@
obj/src/%.hpp.o: src/%.hpp
link_lbs: $(OBJECT_FILES)
$(CXX) $(LNK_FLAGS) $(LNK_FLAGS) $(foreach lib,$(LIBRARY_DIRECTORIES),-L$(lib)) $(foreach lnk,$(LINKER_INPUTS),-l$(lnk)) $^ -o build/$(OUTPUT_NAME)
build_deps: .make/thirdparty_luajit
build_deps: .make/thirdparty_luajit .make/thirdparty_uniproc
.make/thirdparty_luajit:
git submodule update --init --recursive
git submodule update --init --recursive --remote
cd thirdparty/luajit/src $(PLATFORM_SEPERATOR) $(LUAJUT_BUILD_CMD)
$(call touch,".make/thirdparty_luajit")
$(call touch,".make/thirdparty_luajit")
.make/thirdparty_uniproc:
git submodule update --init --recursive --remote