tseeker-pub/demotool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI - Resolved last build issues

Browse source 
+ Tool has name!
+ Finished renaming files
+ Fixed common sync code that still had some SDL shit left
This commit is contained in:
Emmanuel BENOîT 2017-11-24 10:08:41 +01:00
parent 81a60d7832
commit 0fcfeb1fee
11 changed files with 73 additions and 58 deletions

58
Makefile
View file

@ -7,8 +7,10 @@ CPPFLAGS += -I. -I$(OUTDIR) \
-I3rdparty/icon-font-headers \
-I3rdparty/ebcl/include \
-DREAL_BUILD -DGLM_ENABLE_EXPERIMENTAL
LIBS += $(shell sdl2-config --libs) -lGL -lGLEW -ldl \
$(LIBEBCL) -latomic
BUILDER_LIBS = $(LIBEBCL) -latomic
TOOL_LIBS = $(shell sdl2-config --libs) -lGL -lGLEW -ldl $(BUILDER_LIBS)
FILEDUMPS =
@ -32,8 +34,8 @@ COMMON = \
c-syncoverrides.cc \
# END COMMON
DEMO = \
main.cc \
TOOL = \
m-tool.cc \
ui.cc \
ui-actions.cc \
ui-app.cc \
@ -51,45 +53,45 @@ DEMO = \
ui-sync.cc \
ui-texture.cc \
ui-utilities.cc \
# END DEMO
# END TOOL
PARSERCHECK = \
parsercheck.cc \
# END PARSERCHECK
BUILDER = \
m-builder.cc \
# END BUILDER
IMGUI_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(IMGUI))))
COMMON_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(COMMON))))
DEMO_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(DEMO))))
PARSERCHECK_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(PARSERCHECK))))
TOOL_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(TOOL))))
BUILDER_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(BUILDER))))
LIBEBCL = $(OUTDIR)/ebcl/libebcorelib.a
PCH=externals.hh.gch
COMMON_DEPS = $(COMMON_OBJS:$(OUTDIR)/%.o=$(OUTDIR)/%.d)
DEMO_DEPS = $(DEMO_OBJS:$(OUTDIR)/%.o=$(OUTDIR)/%.d)
PARSERCHECK_DEPS = $(PARSERCHECK_OBJS:$(OUTDIR)/%.o=$(OUTDIR)/%.d)
DEMO_DEPS = $(TOOL_OBJS:$(OUTDIR)/%.o=$(OUTDIR)/%.d)
BUILDER_DEPS = $(BUILDER_OBJS:$(OUTDIR)/%.o=$(OUTDIR)/%.d)
COMMON_REQ = $(COMMON_OBJS) $(IMGUI_OBJS)
COMMON_REQ = $(COMMON_OBJS)
DEMO_BUILD = $(DEMO_OBJS) $(COMMON_REQ)
PARSERCHECK_BUILD = $(PARSERCHECK_OBJS) $(COMMON_REQ)
DEMO_BUILD = $(TOOL_OBJS) $(COMMON_REQ) $(IMGUI_OBJS)
BUILDER_BUILD = $(BUILDER_OBJS) $(COMMON_REQ)
ALL_OBJS = $(DEMO_OBJS) $(PARSERCHECK_OBJS) $(COMMON_REQ)
ALL_DEPS = $(COMMON_DEPS) $(DEMO_DEPS) $(PARSERCHECK_DEPS)
ALL_OBJS = $(TOOL_OBJS) $(BUILDER_OBJS) $(COMMON_REQ)
ALL_DEPS = $(COMMON_DEPS) $(DEMO_DEPS) $(BUILDER_DEPS)
all: demo parsercheck
all: tourista tourista-builder
demo: $(LIBEBCL) $(DEMO_BUILD)
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o demo \
$(DEMO_BUILD) $(LIBS)
tourista: $(LIBEBCL) $(DEMO_BUILD)
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o tourista \
$(DEMO_BUILD) $(TOOL_LIBS)
parsercheck: $(LIBEBCL) $(PARSERCHECK_BUILD)
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o parsercheck \
$(PARSERCHECK_BUILD) $(LIBS)
tourista-builder: $(LIBEBCL) $(BUILDER_BUILD)
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o tourista-builder \
$(BUILDER_BUILD) $(BUILDER_LIBS)
clean:
rm -f $(ALL_OBJS) $(FILEDUMPS) demo parsercheck $(PCH) $(OUTDIR)/font-awesome.inl
rm -f $(ALL_OBJS) $(FILEDUMPS) tourista tourista-builder $(PCH) $(OUTDIR)/font-awesome.inl
depclean: clean
rm -f $(ALL_DEPS)
@ -117,7 +119,7 @@ $(IMGUI_OBJS): $(OUTDIR)/%.o: 3rdparty/imgui/%.cpp | outdir
#-------------------------------------------------------------------------------
-include $(DEMO_DEPS)
$(DEMO_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
$(TOOL_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=%.d) -MT $@ $<
@ -130,8 +132,8 @@ $(COMMON_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
#-------------------------------------------------------------------------------
-include $(PARSERCHECK_DEPS)
$(PARSERCHECK_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
-include $(BUILDER_DEPS)
$(BUILDER_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=%.d) -MT $@ $<