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

Build - Moved all 3rd party stuff to a subdirectory

Browse source
This commit is contained in:
Emmanuel BENOîT 2017-11-22 08:59:06 +01:00
parent 5027d91782
commit 1225e1b8a7
9 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitmodules vendored
View file

@ -1,15 +1,15 @@
[submodule "imgui"] [submodule "imgui"]
path = imgui path = 3rdparty/imgui
url = https://github.com/ocornut/imgui.git url = https://github.com/ocornut/imgui.git
[submodule "glm"] [submodule "glm"]
path = glm path = 3rdparty/glm
url = https://github.com/g-truc/glm.git url = https://github.com/g-truc/glm.git
[submodule "ebcl"] [submodule "ebcl"]
path = ebcl path = 3rdparty/ebcl
url = ssh://git@git.nocternity.net:44/u/tseeker/libs/corelib url = ssh://git@git.nocternity.net:44/u/tseeker/libs/corelib
[submodule "font-awesome"] [submodule "font-awesome"]
path = font-awesome path = 3rdparty/font-awesome
url = https://github.com/FortAwesome/Font-Awesome.git url = https://github.com/FortAwesome/Font-Awesome.git
[submodule "IconFontCppHeaders"] [submodule "IconFontCppHeaders"]
path = IconFontCppHeaders path = 3rdparty/icon-font-headers
url = https://github.com/juliettef/IconFontCppHeaders.git url = https://github.com/juliettef/IconFontCppHeaders.git

8
.vim.local/ycm_extra_conf.py
View file

@ -46,10 +46,10 @@ flags = [
'c++', 'c++',
'-I','.', '-I','.',
'-I','build', '-I','build',
'-I','IconFontCppHeaders', '-I','3rdparty/icon-font-headers',
'-I','imgui', '-I','3rdparty/imgui',
'-I','glm', '-I','3rdparty/glm',
'-I','ebcl/include', '-I','3rdparty/ebcl/include',
'-I','/usr/include/SDL2' , '-I','/usr/include/SDL2' ,
'-D','GLM_ENABLE_EXPERIMENTAL', '-D','GLM_ENABLE_EXPERIMENTAL',
] ]

0
ebcl → 3rdparty/ebcl vendored
View file

0
font-awesome → 3rdparty/font-awesome vendored
View file

0
glm → 3rdparty/glm vendored
View file

0
IconFontCppHeaders → 3rdparty/icon-font-headers vendored
View file

0
imgui → 3rdparty/imgui vendored
View file

14
Makefile
View file

@ -3,7 +3,9 @@ OUTDIR = build
CXXFLAGS += $(shell sdl2-config --cflags) -std=c++14 -Wall -g CXXFLAGS += $(shell sdl2-config --cflags) -std=c++14 -Wall -g
CFLAGS += $(shell sdl2-config --cflags) CFLAGS += $(shell sdl2-config --cflags)
CPPFLAGS += -I. -I$(OUTDIR) \ 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 -DREAL_BUILD -DGLM_ENABLE_EXPERIMENTAL
LIBS += $(shell sdl2-config --libs) -lGL -lGLEW -ldl \ LIBS += $(shell sdl2-config --libs) -lGL -lGLEW -ldl \
$(LIBEBCL) -latomic $(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 $@ $< $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -126,7 +128,7 @@ $(PARSERCHECK_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
$(LIBEBCL): ebcl-config $(LIBEBCL): ebcl-config
+make -C ebcl CONFIG=../ebcl-config +make -C 3rdparty/ebcl CONFIG=../../ebcl-config
$(PCH): externals.hh $(PCH): externals.hh
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
@ -135,9 +137,9 @@ $(PCH): externals.hh
$(OUTDIR)/window.o: window.cc $(OUTDIR)/font-awesome.inl $(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-awesome.inl: 3rdparty/font-awesome/fonts/fontawesome-webfont.ttf $(OUTDIR)/font-to-c
$(OUTDIR)/font-to-c -base85 font-awesome/fonts/fontawesome-webfont.ttf \ $(OUTDIR)/font-to-c -base85 3rdparty/font-awesome/fonts/fontawesome-webfont.ttf \
FontAwesome_ >$@ 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 $@ $< $(CXX) -o $@ $<

2
ebcl-config
View file

@ -6,7 +6,7 @@ DEBUG = n
OPTIMIZE = y OPTIMIZE = y
BUILD_TESTS = n BUILD_TESTS = n
OUTDIR = ../build/ebcl OUTDIR = ../../build/ebcl
export BUILD_STATIC_LIB BUILD_DYNAMIC_LIB DEBUG OPTIMIZE BUILD_TESTS export BUILD_STATIC_LIB BUILD_DYNAMIC_LIB DEBUG OPTIMIZE BUILD_TESTS
export OUTDIR export OUTDIR