Use EBCL
This commit is contained in:
parent
6b4bb99469
commit
90abab29a3
4 changed files with 21 additions and 1 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -7,3 +7,6 @@
|
||||||
[submodule "picojson"]
|
[submodule "picojson"]
|
||||||
path = picojson
|
path = picojson
|
||||||
url = https://github.com/kazuho/picojson.git
|
url = https://github.com/kazuho/picojson.git
|
||||||
|
[submodule "ebcl"]
|
||||||
|
path = ebcl
|
||||||
|
url = ssh://git@git.nocternity.net:44/u/tseeker/libs/corelib
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -41,11 +41,12 @@ DEMO = \
|
||||||
IMGUI_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(IMGUI))))
|
IMGUI_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(IMGUI))))
|
||||||
DEMO_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(DEMO))))
|
DEMO_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(DEMO))))
|
||||||
OBJS = $(IMGUI_OBJS) $(DEMO_OBJS)
|
OBJS = $(IMGUI_OBJS) $(DEMO_OBJS)
|
||||||
|
LIBEBCL = $(OUTDIR)/libebcorelib.a
|
||||||
PCH=externals.hh.gch
|
PCH=externals.hh.gch
|
||||||
|
|
||||||
DEMO_DEPS = $(DEMO_OBJS:$(OUTDIR)/%.o=$(OUTDIR)/%.d)
|
DEMO_DEPS = $(DEMO_OBJS:$(OUTDIR)/%.o=$(OUTDIR)/%.d)
|
||||||
|
|
||||||
demo: $(OBJS)
|
demo: $(LIBEBCL) $(OBJS)
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o demo \
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o demo \
|
||||||
$(OBJS) $(LIBS)
|
$(OBJS) $(LIBS)
|
||||||
|
|
||||||
|
@ -75,5 +76,8 @@ $(DEMO_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=%.d) -MT $@ $<
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=%.d) -MT $@ $<
|
||||||
|
|
||||||
|
$(LIBEBCL): ebcl-config
|
||||||
|
+make -C ebcl CONFIG=../ebcl-config
|
||||||
|
|
||||||
$(PCH): externals.hh
|
$(PCH): externals.hh
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||||
|
|
1
ebcl
Submodule
1
ebcl
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 9e753565090c7a7bc8285f72f24af797ebd0a19e
|
12
ebcl-config
Normal file
12
ebcl-config
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
# vim: syntax=make
|
||||||
|
|
||||||
|
BUILD_STATIC_LIB = y
|
||||||
|
BUILD_DYNAMIC_LIB = n
|
||||||
|
DEBUG = n
|
||||||
|
OPTIMIZE = y
|
||||||
|
BUILD_TESTS = n
|
||||||
|
|
||||||
|
OUTDIR = ../output
|
||||||
|
|
||||||
|
export BUILD_STATIC_LIB BUILD_DYNAMIC_LIB DEBUG OPTIMIZE BUILD_TESTS
|
||||||
|
export OUTDIR
|
Loading…
Reference in a new issue