projects
/
andemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed windows build
[andemo]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
fd57f47
..
718b7dd
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-11,7
+11,7
@@
incdir = -Isrc -Ilibs/imago/src -Ilibs/glew
libdir = -Llibs/unix
CFLAGS = $(warn) $(dbg) $(opt) $(def) $(incdir) -fcommon -MMD
libdir = -Llibs/unix
CFLAGS = $(warn) $(dbg) $(opt) $(def) $(incdir) -fcommon -MMD
-LDFLAGS = $(libsys) $(libgl) -lm -limago
+LDFLAGS = $(libdir) $(libsys) $(libgl) -lm -limago
sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
ifeq ($(sys), mingw)
sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
ifeq ($(sys), mingw)
@@
-19,6
+19,7
@@
ifeq ($(sys), mingw)
bin = demo.exe
libgl = -lopengl32
libsys = -lmingw32 -lgdi32 -lwinmm -mconsole
bin = demo.exe
libgl = -lopengl32
libsys = -lmingw32 -lgdi32 -lwinmm -mconsole
+ libdir = -Llibs/w32
else
libgl = -lGL -lX11 -lXext
endif
else
libgl = -lGL -lX11 -lXext
endif