Removed game subprojects; Makefile now uses pkg-config for dependencies
This commit is contained in:
parent
91de53dee3
commit
012f1cc1fc
8
Makefile
8
Makefile
|
@ -21,7 +21,7 @@ endif
|
||||||
BIN = ./bin/
|
BIN = ./bin/
|
||||||
objprefix = $(BIN)obj
|
objprefix = $(BIN)obj
|
||||||
|
|
||||||
DIRS = engine pinball editor brainstorm
|
DIRS = engine editor
|
||||||
ETP = ./source/engine/thirdparty/
|
ETP = ./source/engine/thirdparty/
|
||||||
|
|
||||||
define make_objs
|
define make_objs
|
||||||
|
@ -70,7 +70,7 @@ ifeq ($(UNAME), Windows_NT)
|
||||||
EXT = .exe
|
EXT = .exe
|
||||||
else
|
else
|
||||||
LINKER_FLAGS = -g
|
LINKER_FLAGS = -g
|
||||||
ELIBS = engine glfw3 pthread yughc mruby portaudio asound c m dl
|
ELIBS = engine pthread yughc mruby c m dl
|
||||||
CLIBS =
|
CLIBS =
|
||||||
EXT =
|
EXT =
|
||||||
endif
|
endif
|
||||||
|
@ -78,7 +78,7 @@ endif
|
||||||
CLIBS != $(call prefix, $(CLIBS), -l)
|
CLIBS != $(call prefix, $(CLIBS), -l)
|
||||||
ELIBS != $(call prefix, $(ELIBS), -l)
|
ELIBS != $(call prefix, $(ELIBS), -l)
|
||||||
|
|
||||||
LELIBS = $(ELIBS)
|
LELIBS = $(ELIBS) `pkg-config --libs ./source/glfw/build/src/glfw3.pc` `pkg-config --libs ./source/portaudio/build/portaudio-2.0.pc`
|
||||||
|
|
||||||
objects = $(eobjects)
|
objects = $(eobjects)
|
||||||
DEPENDS = $(objects:.o=.d)
|
DEPENDS = $(objects:.o=.d)
|
||||||
|
@ -98,6 +98,7 @@ yugine: $(yuginec:.%.c=$(objprefix)%.o) $(ENGINE) $(BIN)libportaudio.a $(BIN)lib
|
||||||
$(CC) $< $(LINK) -o yugine
|
$(CC) $< $(LINK) -o yugine
|
||||||
@echo Finished build
|
@echo Finished build
|
||||||
|
|
||||||
|
|
||||||
install: yugine
|
install: yugine
|
||||||
cp yugine ~/.local/bin
|
cp yugine ~/.local/bin
|
||||||
|
|
||||||
|
@ -108,7 +109,6 @@ pin: yugine
|
||||||
cp -f source/scripts/* pinball/scripts
|
cp -f source/scripts/* pinball/scripts
|
||||||
cp -rf source/shaders/* pinball/shaders
|
cp -rf source/shaders/* pinball/shaders
|
||||||
|
|
||||||
|
|
||||||
$(ENGINE): $(eobjects)
|
$(ENGINE): $(eobjects)
|
||||||
@echo Making library engine.a
|
@echo Making library engine.a
|
||||||
@ar r $(ENGINE) $(eobjects)
|
@ar r $(ENGINE) $(eobjects)
|
||||||
|
|
Loading…
Reference in a new issue