From d68972132cd142a12dddbc952c095931a2e0a1c6 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Fri, 1 May 2009 19:05:42 -0400 Subject: [PATCH] reworked how Makefile works wrt to win32 and final builds --- Makefile | 102 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index 1b6a3c6..9d523b5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,20 @@ -LIBGL := -lGL -lGLU -LIBSDL := `sdl-config --libs` -LIBS := ${LIBSDL} ${LIBGL} +# set this on the command line to 1 to get a windows 32 build +WIN32 := 0 + +# set this on the command line to 1 to get a final (none debug) build +FINAL := 0 + + +ifeq (${WIN32},1) + LIBGL := -lopengl32 -lglu32 + LIBSDL := `/usr/mingw32/bin/sdl-config --libs` +else + LIBGL := -lGL -lGLU + LIBSDL := `sdl-config --libs` +endif +LIBS := ${LIBSDL} ${LIBGL} + OPTFLAGS := -O2 DBGFLAGS := -ggdb @@ -9,17 +22,33 @@ PRFFLAGS := ${DBGFLAGS} -pg MYFLAGS := -Wall -pedantic -ansi VALFLAGS := --leak-check=full -CXXFLAGS := ${MYFLAGS} ${DBGFLAGS} +ifeq (${WIN32},1) + CXXFLAGS := ${OPTFLAGS} +else ifeq (${FINAL},1) + CXXFLAGS := ${OPTFLAGS} +else + CXXFLAGS := ${MYFLAGS} ${DBGFLAGS} +endif -CXX := g++ +ifeq (${WIN32},1) + CXX := mingw32-g++ +else + CXX := g++ +endif DIRS := # := start SRCSDIR := src/ SRCS := # := start -OBJSDIR := objsd/ -OBJS := # := start +ifeq (${WIN32},1) + OBJSDIR := objs-mingw32/ +else ifeq (${FINAL},1) + OBJSDIR := objs/ +else + OBJSDIR := objsd/ +endif +OBJS := # := start DEPSDIR := deps/ DEPS := # := start @@ -28,7 +57,13 @@ DEPS := # := start DIRMK := dir.mk include ${SRCSDIR}${DIRMK} -WORKINGDIR := bind/ +ifeq (${WIN32},1) + WORKINGDIR := bin-mingw32/ +else ifeq (${FINAL},1) + WORKINGDIR := bin/ +else + WORKINGDIR := bind/ +endif CFGDIRNAME := configs/ SRCCFGDIR := ${CFGDIRNAME} @@ -48,7 +83,11 @@ LIBSTXT += VERSION-SDL LIBSTXT := $(addprefix ${DSTLIBSDIR},${LIBSTXT}) LIBSCPY := # := start -LIBSCPY += libSDL.so +ifeq (${WIN32},1) + LIBSCPY += SDL.dll +else + LIBSCPY += libSDL.so +endif LIBSCPY := $(addprefix ${DSTLIBSDIR},${LIBSCPY}) SRCTXTDIR := @@ -58,7 +97,11 @@ TXT := # := start TXT += COPYING TXT := $(addprefix ${DSTTXTDIR},${TXT}) -TARGETNAME := run_physics +ifeq (${WIN32},1) + TARGETNAME := run_physics.exe +else + TARGETNAME := run_physics +endif TARGETTMP := ${OBJSDIR}${TARGETNAME} TARGET := ${WORKINGDIR}${TARGETNAME} @@ -134,6 +177,8 @@ ${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@) ${Q2}${CXX} -MM ${CXXFLAGS} $< -I "${INCDIRS}" | \ sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@ +CLEANCMDS := cleanbin cleanobjs cleandeps clean cleanall + .PHONY: cleanbin cleanbin: ${Q1}${PRNTFMT} "rm" "${WORKINGDIR}" @@ -151,6 +196,8 @@ cleandeps: .PHONY: clean clean: cleanobjs + ${Q1}${PRNTFMT} "rm" "${TARGET}" + ${Q2}rm -rf ${TARGET} .PHONY: cleanall cleanall: clean cleanbin cleandeps @@ -176,7 +223,11 @@ physics.tar.bz2: .PHONY: run run: all +ifeq (${WIN32},1) + cd ${WORKINGDIR}; wine ${TARGETNAME} +else cd ${WORKINGDIR}; ./${TARGETNAME} +endif .PHONY: gdb gdb: all @@ -196,30 +247,7 @@ prof: run cd ${WORKINGDIR}; kprof -f prof -MINGMAKEARGS := "LIBGL := -lopengl32 -lglu32" \ - "LIBSDL := `/usr/mingw32/bin/sdl-config --libs`" \ - "LIBSCPY := $(addprefix bin-mingw32/,SDL.dll)" \ - "CXXFLAGS := ${OPTFLAGS}" \ - "CXX := mingw32-g++" \ - "OBJSDIR := objs-mingw32/" \ - "WORKINGDIR := bin-mingw32/" \ - "TARGETNAME := run_physics.exe" - -.PHONY: mingw32 -mingw32: - ${Q1}${PRNTFMT} "make" "mingw32" - ${Q2}${MAKE} ${MINGMAKEARGS} cleanbin cleanobjs - ${Q2}${MAKE} ${MINGMAKEARGS} all - -FINALMAKEARGS := "CXXFLAGS := ${OPTFLAGS}" \ - "OBJSDIR := objs/" \ - "WORKINGDIR := bin/" - -.PHONY: final -final: - ${Q1}${PRNTFMT} "make" "final" - ${Q2}${MAKE} ${FINALMAKEARGS} cleanbin cleanobjs - ${Q2}${MAKE} ${FINALMAKEARGS} all - - --include ${DEPS} +# Do not include deps files when doing a _single_ clean operation +ifeq ($(findstring ${MAKECMDGOALS},${CLEANCMDS}),) + -include ${DEPS} +endif -- 2.10.2