Build - Changed output directory
This commit is contained in:
parent
0b33acc92a
commit
5027d91782
4 changed files with 6 additions and 6 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -7,4 +7,4 @@ imgui.ini
|
|||
.*.d
|
||||
.vim.local/data/*
|
||||
.vim.local/signature
|
||||
output/
|
||||
build/
|
||||
|
|
|
@ -45,7 +45,7 @@ flags = [
|
|||
'-x',
|
||||
'c++',
|
||||
'-I','.',
|
||||
'-I','output',
|
||||
'-I','build',
|
||||
'-I','IconFontCppHeaders',
|
||||
'-I','imgui',
|
||||
'-I','glm',
|
||||
|
|
6
Makefile
6
Makefile
|
@ -1,4 +1,4 @@
|
|||
OUTDIR = output
|
||||
OUTDIR = build
|
||||
|
||||
CXXFLAGS += $(shell sdl2-config --cflags) -std=c++14 -Wall -g
|
||||
CFLAGS += $(shell sdl2-config --cflags)
|
||||
|
@ -80,11 +80,11 @@ parsercheck: $(LIBEBCL) $(PARSERCHECK_BUILD)
|
|||
$(PARSERCHECK_BUILD) $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f $(ALL_OBJS) $(FILEDUMPS) demo parsercheck $(PCH)
|
||||
rm -f $(ALL_OBJS) $(FILEDUMPS) demo parsercheck $(PCH) $(OUTDIR)/font-awesome.inl
|
||||
|
||||
fullclean: clean
|
||||
@+make -C ebcl fullclean CONFIG=../ebcl-config
|
||||
rm -f $(ALL_DEPS)
|
||||
rm -f $(ALL_DEPS) $(OUTDIR)/font-to-c
|
||||
|
||||
.PHONY: all clean fullclean
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ DEBUG = n
|
|||
OPTIMIZE = y
|
||||
BUILD_TESTS = n
|
||||
|
||||
OUTDIR = ../output/ebcl
|
||||
OUTDIR = ../build/ebcl
|
||||
|
||||
export BUILD_STATIC_LIB BUILD_DYNAMIC_LIB DEBUG OPTIMIZE BUILD_TESTS
|
||||
export OUTDIR
|
||||
|
|
Loading…
Reference in a new issue