projects
/
laserbrain_demo
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
80c04e7
)
mingw/msys2 port almost done. glew is still a sticking point
author
John Tsiombikas
<nuclear@mutantstargoat.com>
Fri, 19 May 2017 09:24:41 +0000
(
02:24
-0700)
committer
John Tsiombikas
<nuclear@mutantstargoat.com>
Fri, 19 May 2017 09:24:41 +0000
(
02:24
-0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
c03fb83
..
7ee900b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-14,13
+14,14
@@
warn = -pedantic -Wall
CFLAGS = $(warn) $(opt) $(dbg) $(incpath)
CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
CFLAGS = $(warn) $(opt) $(dbg) $(incpath)
CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
-LDFLAGS = $(libpath) $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \
- -lpthread -lassimp -ltreestore -ldrawtext -lgoatvr `pkg-config --libs sdl2`
+LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \
+ -lpthread -lassimp -ltreestore -lgoatvr \
+ -lz -lpng -ljpeg `pkg-config --libs sdl2 freetype2`
sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
libgl_Linux = -lGL -lGLU -lGLEW
libgl_Darwin = -framework OpenGL -lGLEW
sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
libgl_Linux = -lGL -lGLU -lGLEW
libgl_Darwin = -framework OpenGL -lGLEW
-libgl_mingw = -lopengl32 -lglu32 -lglew32
+libgl_mingw = -lopengl32 -lglu32 -lglew32.dll
ifeq ($(sys), msys)
CFLAGS += -mwin32
ifeq ($(sys), msys)
CFLAGS += -mwin32