diff --git a/makefile b/makefile index a69688a..7d24a11 100644 --- a/makefile +++ b/makefile @@ -18,6 +18,8 @@ STATE ?=RELEASE ARCH ?=x64 # SOFTWARE, OS TYPE ?=SOFTWARE +# TRUE, FALSE +TEST ?=FALSE #define PKG_CONFIG #export @@ -58,6 +60,13 @@ endif # LDFLAGS += -m elf_i386 -T linker.ld # LDFLAGS += -m elf_x86_64 -T linker.ld +#ifeq ($(TEST),TRUE) +# C_FLAGS += -DTESTING +# CXX_FLAGS += -DTESTING +# AS_FLAGS += -DTESTING +# LDFLAGS += -DTESTING +#endif + OUT := $(BUILD)$(PROJECT).exe ifeq ($(OSS),WIN) OUT := $(BUILD)$(PROJECT).exe @@ -153,7 +162,7 @@ $(CXX_OBJS): $(CXX_SOURCES) $(CXX) $(CXXFLAGS) -c $< -o $@ create_directories: - mkdir -p $(BUILD) $(foreach file,$(IMGUIOBJS),$(shell dirname $(file))) $(foreach file,$(ASM_OBJS),$(shell dirname $(file))) $(foreach file,$(C_OBJS),$(shell dirname $(file))) $(foreach file,$(CXX_OBJS),$(shell dirname $(file))) + mkdir -p $(BUILD) $(dir $(OUT)) $(foreach file,$(IMGUIOBJS),$(shell dirname $(file))) $(foreach file,$(ASM_OBJS),$(shell dirname $(file))) $(foreach file,$(C_OBJS),$(shell dirname $(file))) $(foreach file,$(CXX_OBJS),$(shell dirname $(file))) #"$(ROOT)shared/lib/$(ARCH)/libimgui.a": $(IMGUIOBJS) # $(CXX) $(LDFLAGS) -shared -o $@ $^ diff --git a/shared/lib/x64/imgui.dll b/shared/lib/x64/imgui.dll index 6a3dbcb..5674860 100644 Binary files a/shared/lib/x64/imgui.dll and b/shared/lib/x64/imgui.dll differ