X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?p=physics.git;a=blobdiff_plain;f=Makefile;h=769b91d5d5beaafddba5a760a40003d26d509927;hp=9b5a2f6bb2db17a0415d2cc5078d59f79fca1dd0;hb=5ab56236b9cfb4f04aee7c93eb0c27e7bec9d600;hpb=bb552d933ec4bc4484eb7868cb7993996833f3d3

diff --git a/Makefile b/Makefile
index 9b5a2f6..769b91d 100644
--- a/Makefile
+++ b/Makefile
@@ -85,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
@@ -96,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
@@ -126,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