Build - Moved all 3rd party stuff to a subdirectory
This commit is contained in:
parent
5027d91782
commit
1225e1b8a7
9 changed files with 18 additions and 16 deletions
14
Makefile
14
Makefile
|
@ -3,7 +3,9 @@ OUTDIR = build
|
|||
CXXFLAGS += $(shell sdl2-config --cflags) -std=c++14 -Wall -g
|
||||
CFLAGS += $(shell sdl2-config --cflags)
|
||||
CPPFLAGS += -I. -I$(OUTDIR) \
|
||||
-Iimgui -Iglm -IIconFontCppHeaders -Iebcl/include \
|
||||
-I3rdparty/imgui -I3rdparty/glm \
|
||||
-I3rdparty/icon-font-headers \
|
||||
-I3rdparty/ebcl/include \
|
||||
-DREAL_BUILD -DGLM_ENABLE_EXPERIMENTAL
|
||||
LIBS += $(shell sdl2-config --libs) -lGL -lGLEW -ldl \
|
||||
$(LIBEBCL) -latomic
|
||||
|
@ -99,7 +101,7 @@ outdir:
|
|||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
$(IMGUI_OBJS): $(OUTDIR)/%.o: imgui/%.cpp | outdir
|
||||
$(IMGUI_OBJS): $(OUTDIR)/%.o: 3rdparty/imgui/%.cpp | outdir
|
||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
@ -126,7 +128,7 @@ $(PARSERCHECK_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
|
|||
#-------------------------------------------------------------------------------
|
||||
|
||||
$(LIBEBCL): ebcl-config
|
||||
+make -C ebcl CONFIG=../ebcl-config
|
||||
+make -C 3rdparty/ebcl CONFIG=../../ebcl-config
|
||||
|
||||
$(PCH): externals.hh
|
||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
|
@ -135,9 +137,9 @@ $(PCH): externals.hh
|
|||
|
||||
$(OUTDIR)/window.o: window.cc $(OUTDIR)/font-awesome.inl
|
||||
|
||||
$(OUTDIR)/font-awesome.inl: font-awesome/fonts/fontawesome-webfont.ttf $(OUTDIR)/font-to-c
|
||||
$(OUTDIR)/font-to-c -base85 font-awesome/fonts/fontawesome-webfont.ttf \
|
||||
$(OUTDIR)/font-awesome.inl: 3rdparty/font-awesome/fonts/fontawesome-webfont.ttf $(OUTDIR)/font-to-c
|
||||
$(OUTDIR)/font-to-c -base85 3rdparty/font-awesome/fonts/fontawesome-webfont.ttf \
|
||||
FontAwesome_ >$@
|
||||
|
||||
$(OUTDIR)/font-to-c: imgui/extra_fonts/binary_to_compressed_c.cpp
|
||||
$(OUTDIR)/font-to-c: 3rdparty/imgui/extra_fonts/binary_to_compressed_c.cpp
|
||||
$(CXX) -o $@ $<
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue