From 3dc922c4ad093b605a6b54d37dd61f232f17e99d Mon Sep 17 00:00:00 2001 From: josh Date: Tue, 16 Dec 2008 19:29:24 +0000 Subject: [PATCH] Updated Makefile to work with sdl-config and ode-config batch files git-svn-id: svn://anubis/dwscr/trunk@111 5bef9df8-b654-44bb-925b-0ff18baa8f8c --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index df23fa5..99eb12b 100644 --- a/Makefile +++ b/Makefile @@ -21,15 +21,13 @@ export CP := copy export MV := rename export CC := mingw32-gcc export CXX := mingw32-g++ -SDL_BASE := C:\apps\SDL-1.2.13 -ODE_BASE := C:\apps\ode-0.9 -export CPPFLAGS += -I$(SDL_BASE)\include -D_GNU_SOURCE=1 -Dmain=SDL_main +export CPPFLAGS += $(shell sdl-config --cflags) ifndef WITHOUT_ODE -export CPPFLAGS += -I$(ODE_BASE)\include +export CPPFLAGS += $(shell ode-config --cflags) endif -LDFLAGS += -L$(SDL_BASE)\lib -lopengl32 -lglu32 -lmingw32 -mwindows -lSDLmain -lSDL +LDFLAGS += -lopengl32 -lglu32 -lmingw32 $(shell sdl-config --libs) ifndef WITHOUT_ODE -LDFLAGS += -L$(ODE_BASE)\lib\releasedll -lode +LDFLAGS += $(shell ode-config --libs) endif TARGET := $(TARGET).exe SSNAME := dwscr.scr