X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=3252ec7e669e0ea334ffcf4efac29495f42622d7;hb=dd7ce87b0ad2b8a1b4758bcc9354e993b71c8599;hp=8116c12d426e1385b7fcbf6669798ae3c2be39aa;hpb=48ee87d8c32791d17fa7a57076df5d6721d6c05c;p=raydungeon

diff --git a/Makefile b/Makefile
index 8116c12..3252ec7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,23 +5,29 @@ bin = game
 
 warn = -pedantic -Wall
 dbg = -g
+def = -DMINIGLUT_USE_LIBC
+
+inc = -Ilibs/assfile
+liblist = libs/assfile/assfile.a
 
 CFLAGS = $(warn) $(opt) $(dbg) $(inc) $(def) -MMD
-LDFLAGS = $(syslib) $(libgl)
+LDFLAGS = $(syslib) $(libgl) $(libs) -lm
 
 sys := $(shell uname -s | sed 's/MINGW.*/mingw/')
 ifeq ($(sys), mingw)
 	syslib = -mwindows
-	libgl = -lopengl32 -lfreeglut
+	libgl = -lopengl32 -lgdi32 -lwinmm
 
 	obj = $(src:.c=.w32.o)
 	dep = $(src:.c=.w32.d)
 	bin = game.exe
+	libs = $(liblist:.a=.w32.a)
 else
-	libgl = -lGL -lGLU -lglut
+	libgl = -lGL -lGLU -lX11
+	libs = $(liblist)
 endif
 
-$(bin): $(obj)
+$(bin): $(obj) libs
 	$(CC) -o $@ $(obj) $(LDFLAGS)
 
 -include $(dep)
@@ -29,14 +35,22 @@ $(bin): $(obj)
 %.w32.o: %.c
 	$(CC) -c $< $(CFLAGS) -o $@
 
+.PHONY: libs
+libs:
+	$(MAKE) -C libs/assfile
+
+.PHONY: clean-libs
+clean-libs:
+	$(MAKE) -C libs/assfile clean
+
 .PHONY: clean
 clean:
 	rm -f $(obj) $(bin)
 
 .PHONY: cross
 cross:
-	$(MAKE) CC=i686-w64-mingw32-gcc sys=mingw
+	$(MAKE) CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar sys=mingw
 
-.PHONY: cross-clean
-cross-clean:
+.PHONY: clean-cross
+clean-cross:
 	$(MAKE) sys=mingw clean