Skip to content

Commit

Permalink
I guess I edited the makefile at some point
Browse files Browse the repository at this point in the history
  • Loading branch information
Sammyueru committed Jan 13, 2024
1 parent 9b6ae24 commit 4a875d8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ STATE ?=RELEASE
ARCH ?=x64
# SOFTWARE, OS
TYPE ?=SOFTWARE
# TRUE, FALSE
TEST ?=FALSE

#define PKG_CONFIG
#export
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 $@ $^
Expand Down
Binary file modified shared/lib/x64/imgui.dll
Binary file not shown.

0 comments on commit 4a875d8

Please sign in to comment.