From 90abab29a3013e44830cd96d078a38d441d5fcdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Wed, 1 Nov 2017 23:34:31 +0100 Subject: [PATCH] Use EBCL --- .gitmodules | 3 +++ Makefile | 6 +++++- ebcl | 1 + ebcl-config | 12 ++++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 160000 ebcl create mode 100644 ebcl-config diff --git a/.gitmodules b/.gitmodules index 338898b..d9c0b91 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "picojson"] path = picojson url = https://github.com/kazuho/picojson.git +[submodule "ebcl"] + path = ebcl + url = ssh://git@git.nocternity.net:44/u/tseeker/libs/corelib diff --git a/Makefile b/Makefile index c480409..9eba200 100644 --- a/Makefile +++ b/Makefile @@ -41,11 +41,12 @@ DEMO = \ IMGUI_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(IMGUI)))) DEMO_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(DEMO)))) OBJS = $(IMGUI_OBJS) $(DEMO_OBJS) +LIBEBCL = $(OUTDIR)/libebcorelib.a PCH=externals.hh.gch DEMO_DEPS = $(DEMO_OBJS:$(OUTDIR)/%.o=$(OUTDIR)/%.d) -demo: $(OBJS) +demo: $(LIBEBCL) $(OBJS) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o demo \ $(OBJS) $(LIBS) @@ -75,5 +76,8 @@ $(DEMO_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=%.d) -MT $@ $< +$(LIBEBCL): ebcl-config + +make -C ebcl CONFIG=../ebcl-config + $(PCH): externals.hh $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/ebcl b/ebcl new file mode 160000 index 0000000..9e75356 --- /dev/null +++ b/ebcl @@ -0,0 +1 @@ +Subproject commit 9e753565090c7a7bc8285f72f24af797ebd0a19e diff --git a/ebcl-config b/ebcl-config new file mode 100644 index 0000000..561a76a --- /dev/null +++ b/ebcl-config @@ -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