From aa37258391ede09aa736b1410497257abd8c1b74 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 22 Sep 2009 16:16:19 +0000 Subject: [PATCH] program building on Windows with updated Makefile git-svn-id: svn://anubis/anaglym/trunk@27 99a6e188-d820-4881-8870-2d33a10e2619 --- Makefile | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 745b573..47a4782 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,12 @@ CDEPS := $(COBJS:.o=.dep) CXXDEPS := $(CXXOBJS:.o=.dep) DEPS := $(CDEPS) $(CXXDEPS) +WINCHECK := $(shell which msys-1.0.dll >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo MSYS; fi) +ifeq ($(strip $(WINCHECK)),) +WINDOWS := 0 +else +WINDOWS := 1 +endif LUAINCLUDE := $(shell which lua-config >/dev/null 2>&1; if [ $$? -eq 0 ]; then lua-config --include; fi) ifeq ($(strip $(LUAINCLUDE)),) LUAINCLUDE := -I/usr/include/lua5.1 @@ -16,14 +22,21 @@ ifeq ($(strip $(LUALIBS)),) LUALIBS := -llua5.1 endif -SDLINCLUDE := `sdl-config --cflags` -SDLLIBS := `sdl-config --libs` +SDLINCLUDE := $(shell sdl-config --cflags) +SDLLIBS := $(shell sdl-config --libs) -ODEINCLUDE := `ode-config --cflags` -ODELIBS := `ode-config --libs` +ODEINCLUDE := $(shell ode-config --cflags) +ODELIBS := $(shell ode-config --libs) + +ifeq ($(WINDOWS),1) +GLLIBS := -lopengl32 -lglu32 +WINDOWSLIBS := -lmingw32 +else +GLLIBS := -lGL -lGLU +endif CPPFLAGS := $(LUAINCLUDE) $(SDLINCLUDE) $(ODEINCLUDE) -LDFLAGS := $(LUALIBS) $(SDLLIBS) $(ODELIBS) -lGL -lGLU +LDFLAGS := $(LUALIBS) $(ODELIBS) $(GLLIBS) $(WINDOWSLIBS) $(SDLLIBS) all: $(TARGET)