added pg.dll

[physics.git] / Makefile

diff --git a/Makefile b/Makefile
index 6faa1df..769b91d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,11 +28,13 @@ LNKFLAGS := -Wl,-rpath,${RPATH}
 
 ifeq (${WIN32},1)
     CXXFLAGS    := ${OPTFLAGS}
-else ifeq (${FINAL},1)
+else
+ifeq (${FINAL},1)
     CXXFLAGS    := ${OPTFLAGS}
 else
     CXXFLAGS    := ${MYFLAGS} ${DBGFLAGS}
 endif
+endif
 
 ifeq (${WIN32},1)
     CXX := mingw32-g++
@@ -47,11 +49,13 @@ SRCS    := # := start
 
 ifeq (${WIN32},1)
     OBJSDIR := objs-mingw32/
-else ifeq (${FINAL},1)
+else
+ifeq (${FINAL},1)
     OBJSDIR := objs/
 else
     OBJSDIR := objsd/
 endif
+endif
 OBJS        := # := start
 
 DEPSDIR := deps/
@@ -63,11 +67,13 @@ include ${SRCSDIR}${DIRMK}
 
 ifeq (${WIN32},1)
     WORKINGDIR  := bin-mingw32/
-else ifeq (${FINAL},1)
+else
+ifeq (${FINAL},1)
     WORKINGDIR  := bin/
 else
     WORKINGDIR  := bind/
 endif
+endif
 
 CFGDIRNAME  := configs/
 SRCCFGDIR   := ${CFGDIRNAME}
@@ -79,7 +85,11 @@ CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
 
 LIBSDIRNAME := libs/
 SRCLIBSDIR  := ${LIBSDIRNAME}
-DSTLIBSDIR  := ${WORKINGDIR}${LIBSDIRNAME}
+ifeq (${WIN32},1)
+    DSTLIBSDIR  := ${WORKINGDIR}
+else
+    DSTLIBSDIR  := ${WORKINGDIR}${LIBSDIRNAME}
+endif
 
 LIBSTXT     := # := start
 LIBSTXT     += COPYING-SDL
@@ -90,6 +100,7 @@ LIBSTXT     := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
 LIBSCPY     := # := start
 ifeq (${WIN32},1)
     LIBSCPY += SDL.dll
+    LIBSCPY += pg.dll
 else
     LIBSCPY += libSDL-1.2.so.0
     LIBSCPY += libpg.so.0
@@ -120,12 +131,17 @@ BLDDIRS     += ${DEPSBLDDIRS}
 BLDDIRS     += ${WORKINGDIR}
 BLDDIRS     += ${DSTCFGDIR}
 BLDDIRS     += ${DSTLIBSDIR}
+BLDDIRS     := $(sort ${BLDDIRS}) # remove possible duplicates
 
 INCDIRS     := ${SRCSDIR}
 INCFLAGS    := $(addprefix -I, ${INCDIRS})
 
 
-PRNTFMT := printf "%-5s: %s\n"
+ifeq (${WIN32},1)
+    PRNTFMT := printf "%-12s: %s\n"
+else
+    PRNTFMT := printf "%-8s: %s\n"
+endif
 
 VERBOSE := 0