X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=12024ae6ff2a9d70e790c27482f2efbcc8a34e6c;hb=fca3f24e31b3bbbe81ce0ef00da901480a2a92cc;hp=718b7dd9c71bedabcbe99fd2a500ac5099929206;hpb=e808f24e718ba3eae01b20dc3dc9e1526fd20871;p=andemo diff --git a/Makefile b/Makefile index 718b7dd..12024ae 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,11 @@ warn = -pedantic -Wall dbg = -g #opt = -O3 -ffast-math -fno-strict-aliasing def = -DMINIGLUT_USE_LIBC -DGLEW_STATIC -incdir = -Isrc -Ilibs/imago/src -Ilibs/glew +incdir = -Isrc -Ilibs -Ilibs/imago/src -Ilibs/glew libdir = -Llibs/unix CFLAGS = $(warn) $(dbg) $(opt) $(def) $(incdir) -fcommon -MMD -LDFLAGS = $(libdir) $(libsys) $(libgl) -lm -limago +LDFLAGS = $(libdir) $(libsys) $(libgl) -limago -lpsys -lanim $(libc) sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/') ifeq ($(sys), mingw) @@ -20,11 +20,13 @@ ifeq ($(sys), mingw) libgl = -lopengl32 libsys = -lmingw32 -lgdi32 -lwinmm -mconsole libdir = -Llibs/w32 + libc = -lm else libgl = -lGL -lX11 -lXext + libc = -lm -ldl endif -$(bin): $(obj) +$(bin): $(obj) Makefile $(CC) -o $@ $(obj) $(LDFLAGS) -include $(dep)