projects
/
laserbrain_demo
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c77ee2a
)
fixed cross-build
author
John Tsiombikas
<nuclear@mutantstargoat.com>
Fri, 1 Sep 2017 01:25:59 +0000
(
04:25
+0300)
committer
John Tsiombikas
<nuclear@mutantstargoat.com>
Fri, 1 Sep 2017 01:25:59 +0000
(
04:25
+0300)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
4b65ac3
..
d3220fc
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-8,7
+8,7
@@
bin = demo
dbg = -g
incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
dbg = -g
incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
-libpath = -L/usr/local/lib
+#libpath = -L/usr/local/lib
warn = -pedantic -Wall
warn = -pedantic -Wall
@@
-16,7
+16,7
@@
CFLAGS = $(warn) $(opt) $(dbg) $(incpath)
CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago \
-lresman -lpthread -lassimp -ltreestore -lgoatvr \
CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago \
-lresman -lpthread -lassimp -ltreestore -lgoatvr \
- -lz -lpng -ljpeg `pkg-config --libs sdl2 freetype2`
+ `pkg-config --libs sdl2 freetype2` -lpng -ljpeg -lz
sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
libgl_Linux = -lGL -lGLU -lGLEW
sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
libgl_Linux = -lGL -lGLU -lGLEW
@@
-26,6
+26,7
@@
libgl_mingw = -lopengl32 -lglu32 -lglew32
ifeq ($(sys), mingw)
bin = demo.exe
ifeq ($(sys), mingw)
bin = demo.exe
+ LDFLAGS += -lmingw32 -lSDL2main -lSDL2 -lwinmm -mwindows
#CFLAGS += -DGLEW_STATIC
#CXXFLAGS += -DGLEW_STATIC
endif
#CFLAGS += -DGLEW_STATIC
#CXXFLAGS += -DGLEW_STATIC
endif
@@
-35,7
+36,7
@@
$(bin): .clang_complete $(obj)
.PHONY: cross
cross:
.PHONY: cross
cross:
- $(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++
+ $(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ sys=mingw
.PHONY: instalien
instalien: demo.exe
.PHONY: instalien
instalien: demo.exe