diff options
29 files changed, 224 insertions, 218 deletions
@@ -23,7 +23,7 @@ # # The Original Code is: revision 1.1 # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # diff --git a/extern/bFTGL/src/Makefile b/extern/bFTGL/src/Makefile index 17c6016ad03..d91bcb2559d 100644 --- a/extern/bFTGL/src/Makefile +++ b/extern/bFTGL/src/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -46,15 +48,13 @@ CPPFLAGS += -I../include CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2 CPPFLAGS += -I$(OPENGL_HEADERS) -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_FTGL) ] || mkdir -p $(NAN_FTGL) @[ -d $(NAN_FTGL)/include ] || mkdir -p $(NAN_FTGL)/include - @[ -d $(NAN_FTGL)/lib ] || mkdir -p $(NAN_FTGL)/lib - @[ -d $(NAN_FTGL)/lib/debug ] || mkdir -p $(NAN_FTGL)/lib/debug - @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_FTGL)/lib/ -# @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/debug/lib$(LIBNAME).a $(NAN_FTGL)/lib/debug/ + @[ -d $(NAN_FTGL)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_FTGL)/lib/$(DEBUG_DIR) + @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_FTGL)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_FTGL)/lib/lib$(LIBNAME).a + ranlib $(NAN_FTGL)/lib/$(DEBUG_DIR)lib$(LIBNAME).a endif @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/*.h $(NAN_FTGL)/include/ diff --git a/extern/binreloc/Makefile b/extern/binreloc/Makefile index dbd093500a1..d303ab3afcc 100644 --- a/extern/binreloc/Makefile +++ b/extern/binreloc/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -30,8 +32,7 @@ CPPFLAGS += -I./include include nan_compile.mk - -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(DIR) ] || mkdir $(DIR) @[ -d $(DIR)/include ] || mkdir $(DIR)/include @../../intern/tools/cpifdiff.sh include/*.h $(DIR)/include/ diff --git a/extern/bullet2/Makefile b/extern/bullet2/Makefile index f3abb86e404..d974569e63d 100644 --- a/extern/bullet2/Makefile +++ b/extern/bullet2/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -48,7 +50,7 @@ include nan_subdirs.mk CP = $(NANBLENDERHOME)/intern/tools/cpifdiff.sh -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BULLET2) ] || mkdir -p $(NAN_BULLET2) @[ -d $(NAN_BULLET2)/include ] || mkdir -p $(NAN_BULLET2)/include @for i in $(BULLETDIRS); do \ diff --git a/extern/glew/src/Makefile b/extern/glew/src/Makefile index 55cc7cfccad..ebcecae45c8 100644 --- a/extern/glew/src/Makefile +++ b/extern/glew/src/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -25,7 +27,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL/BL DUAL LICENSE BLOCK ***** # @@ -42,15 +44,13 @@ CSRCS = glew.c CCSRCS = include nan_compile.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_GLEW) ] || mkdir -p $(NAN_GLEW) @[ -d $(NAN_GLEW)/include/GL ] || mkdir -p $(NAN_GLEW)/include/GL - @[ -d $(NAN_GLEW)/lib ] || mkdir -p $(NAN_GLEW)/lib - @[ -d $(NAN_GLEW)/lib/debug ] || mkdir -p $(NAN_GLEW)/lib/debug - @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_GLEW)/lib/ + @[ -d $(NAN_GLEW)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_GLEW)/lib/$(DEBUG_DIR) + @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_GLEW)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_GLEW)/lib/lib$(LIBNAME).a - ranlib $(NAN_GLEW)/lib/lib$(LIBNAME).a + ranlib $(NAN_GLEW)/lib/$(DEBUG_DIR)lib$(LIBNAME).a endif @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/GL/*.h $(NAN_GLEW)/include/GL diff --git a/extern/ode/Makefile b/extern/ode/Makefile index 51be666aa69..9bdef821e45 100644 --- a/extern/ode/Makefile +++ b/extern/ode/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** @@ -60,8 +62,7 @@ all: mv $(TEMPSETTINGS) $(USERSETTINGS) endif -# fake debug target -debug: +debug:: install install: all ifeq ($(OS),$(findstring $(OS), "freebsd linux darwin")) diff --git a/extern/qhull/src/Makefile b/extern/qhull/src/Makefile index 8201e44f01b..81c06758cbb 100644 --- a/extern/qhull/src/Makefile +++ b/extern/qhull/src/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -40,16 +42,13 @@ CSRCS = user.c global.c stat.c io.c geom2.c poly2.c \ CCSRCS = include nan_compile.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_QHULL) ] || mkdir -p $(NAN_QHULL) @[ -d $(NAN_QHULL)/include/qhull ] || mkdir -p $(NAN_QHULL)/include/qhull - @[ -d $(NAN_QHULL)/lib ] || mkdir -p $(NAN_QHULL)/lib - @[ -d $(NAN_QHULL)/lib/debug ] || mkdir -p $(NAN_QHULL)/lib/debug - @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_QHULL)/lib/ -# @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/debug/lib$(LIBNAME).a $(NAN_QHULL)/lib/debug/ + @[ -d $(NAN_QHULL)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_QHULL)/lib/$(DEBUG_DIR) + @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_QHULL)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_QHULL)/lib/lib$(LIBNAME).a -# ranlib $(NAN_QHULL)/lib/debug/lib$(LIBNAME).a + ranlib $(NAN_QHULL)/lib/$(DEBUG_DIR)lib$(LIBNAME).a endif @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/qhull/*.h $(NAN_QHULL)/include/qhull diff --git a/extern/solid/Makefile b/extern/solid/Makefile index 3b333c5141d..206dc21c3fb 100644 --- a/extern/solid/Makefile +++ b/extern/solid/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -37,18 +39,15 @@ DIRS = src include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_SOLID) ] || mkdir -p $(NAN_SOLID) @[ -d $(NAN_SOLID)/include/SOLID ] || mkdir -p $(NAN_SOLID)/include/SOLID @[ -d $(NAN_SOLID)/include/SOLID/MT ] || mkdir -p $(NAN_SOLID)/include/SOLID/MT - @[ -d $(NAN_SOLID)/lib ] || mkdir -p $(NAN_SOLID)/lib - @[ -d $(NAN_SOLID)/lib/debug ] || mkdir -p $(NAN_SOLID)/lib/debug + @[ -d $(NAN_SOLID)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_SOLID)/lib/$(DEBUG_DIR) @for i in $(LIBNAMES); do \ - $(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$$i/lib$$i.a $(NAN_SOLID)/lib/ ; \ - $(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$$i/debug/lib$$i.a $(NAN_SOLID)/lib/debug/ ; \ + $(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$$i/$(DEBUG_DIR)lib$$i.a $(NAN_SOLID)/lib/$(DEBUG_DIR) ; \ if [ $(OS) = darwin ] ; then \ - ranlib $(NAN_SOLID)/lib/lib$$i.a ; \ - ranlib $(NAN_SOLID)/lib/debug/lib$$i.a ; \ + ranlib $(NAN_SOLID)/lib/$(DEBUG_DIR)lib$$i.a ; \ fi ; \ done @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh include/*.h $(NAN_SOLID)/include/SOLID diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index 051e2643a87..61785e44e68 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -56,16 +58,13 @@ endif include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_SOUNDSYSTEM) ] || mkdir $(NAN_SOUNDSYSTEM) @[ -d $(NAN_SOUNDSYSTEM)/include ] || mkdir $(NAN_SOUNDSYSTEM)/include - @[ -d $(NAN_SOUNDSYSTEM)/lib ] || mkdir $(NAN_SOUNDSYSTEM)/lib - @[ -d $(NAN_SOUNDSYSTEM)/lib/debug ] || mkdir $(NAN_SOUNDSYSTEM)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/debug/ + @[ -d $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_SOUNDSYSTEM)/lib/libSoundSystem.a - ranlib $(NAN_SOUNDSYSTEM)/lib/debug/libSoundSystem.a + ranlib $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a endif @../tools/cpifdiff.sh *.h $(NAN_SOUNDSYSTEM)/include/ diff --git a/intern/bmfont/Makefile b/intern/bmfont/Makefile index bc42f52a1fb..de0fc715884 100644 --- a/intern/bmfont/Makefile +++ b/intern/bmfont/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # bmfont main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BMFONT) ] || mkdir $(NAN_BMFONT) @[ -d $(NAN_BMFONT)/include ] || mkdir $(NAN_BMFONT)/include - @[ -d $(NAN_BMFONT)/lib ] || mkdir $(NAN_BMFONT)/lib - @[ -d $(NAN_BMFONT)/lib/debug ] || mkdir $(NAN_BMFONT)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libbmfont.a $(NAN_BMFONT)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libbmfont.a $(NAN_BMFONT)/lib/debug/ + @[ -d $(NAN_BMFONT)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BMFONT)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libbmfont.a $(NAN_BMFONT)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_BMFONT)/lib/libbmfont.a - ranlib $(NAN_BMFONT)/lib/debug/libbmfont.a + ranlib $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a endif @../tools/cpifdiff.sh *.h $(NAN_BMFONT)/include/ diff --git a/intern/boolop/Makefile b/intern/boolop/Makefile index 4058c4ca7c1..a7a08f665c7 100644 --- a/intern/boolop/Makefile +++ b/intern/boolop/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # bsp main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BOOLOP) ] || mkdir $(NAN_BOOLOP) @[ -d $(NAN_BOOLOP)/include ] || mkdir $(NAN_BOOLOP)/include - @[ -d $(NAN_BOOLOP)/lib ] || mkdir $(NAN_BOOLOP)/lib - @[ -d $(NAN_BOOLOP)/lib/debug ] || mkdir $(NAN_BOOLOP)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libboolop.a $(NAN_BOOLOP)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libboolop.a $(NAN_BOOLOP)/lib/debug/ + @[ -d $(NAN_BOOLOP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BOOLOP)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libboolop.a $(NAN_BOOLOP)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_BOOLOP)/lib/libboolop.a - ranlib $(NAN_BOOLOP)/lib/debug/libboolop.a + ranlib $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_BOOLOP)/include/ diff --git a/intern/bsp/Makefile b/intern/bsp/Makefile index fd106acab83..cd1653206a6 100644 --- a/intern/bsp/Makefile +++ b/intern/bsp/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # bsp main makefile. @@ -38,19 +40,14 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BSP) ] || mkdir $(NAN_BSP) @[ -d $(NAN_BSP)/include ] || mkdir $(NAN_BSP)/include - @[ -d $(NAN_BSP)/lib ] || mkdir $(NAN_BSP)/lib - @[ -d $(NAN_BSP)/lib/debug ] || mkdir $(NAN_BSP)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libbsp.a $(NAN_BSP)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libbsp.a $(NAN_BSP)/lib/debug/ + @[ -d $(NAN_BSP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BSP)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libbsp.a $(NAN_BSP)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_BSP)/lib/libbsp.a - ranlib $(NAN_BSP)/lib/debug/libbsp.a + ranlib $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_BSP)/include/ - - diff --git a/intern/container/Makefile b/intern/container/Makefile index 76cba5b3ea1..8a9c038f0ee 100644 --- a/intern/container/Makefile +++ b/intern/container/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # container main makefile. @@ -38,12 +40,10 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_CONTAINER) ] || mkdir $(NAN_CONTAINER) @[ -d $(NAN_CONTAINER)/include ] || mkdir $(NAN_CONTAINER)/include - @[ -d $(NAN_CONTAINER)/lib ] || mkdir $(NAN_CONTAINER)/lib - @[ -d $(NAN_CONTAINER)/lib/debug ] || mkdir $(NAN_CONTAINER)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libcontainer.a $(NAN_CONTAINER)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libcontainer.a $(NAN_CONTAINER)/lib/debug + @[ -d $(NAN_CONTAINER)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_CONTAINER)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libcontainer.a $(NAN_CONTAINER)/lib/$(DEBUG_DIR) @../tools/cpifdiff.sh *.h $(NAN_CONTAINER)/include/ diff --git a/intern/decimation/Makefile b/intern/decimation/Makefile index 9241d87c3a3..7ff87fa018b 100644 --- a/intern/decimation/Makefile +++ b/intern/decimation/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # decimation main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_DECIMATION) ] || mkdir $(NAN_DECIMATION) @[ -d $(NAN_DECIMATION)/include ] || mkdir $(NAN_DECIMATION)/include - @[ -d $(NAN_DECIMATION)/lib ] || mkdir $(NAN_DECIMATION)/lib - @[ -d $(NAN_DECIMATION)/lib/debug ] || mkdir $(NAN_DECIMATION)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libdecimation.a $(NAN_DECIMATION)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libdecimation.a $(NAN_DECIMATION)/lib/debug/ + @[ -d $(NAN_DECIMATION)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_DECIMATION)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libdecimation.a $(NAN_DECIMATION)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_DECIMATION)/lib/libdecimation.a - ranlib $(NAN_DECIMATION)/lib/debug/libdecimation.a + ranlib $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_DECIMATION)/include/ diff --git a/intern/elbeem/Makefile b/intern/elbeem/Makefile index 9ea08d63374..e7e8a8baa64 100644 --- a/intern/elbeem/Makefile +++ b/intern/elbeem/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # elbeem main makefile. @@ -40,16 +42,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_ELBEEM) ] || mkdir $(NAN_ELBEEM) @[ -d $(NAN_ELBEEM)/include ] || mkdir $(NAN_ELBEEM)/include - @[ -d $(NAN_ELBEEM)/lib ] || mkdir $(NAN_ELBEEM)/lib - @[ -d $(NAN_ELBEEM)/lib/debug ] || mkdir $(NAN_ELBEEM)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libelbeem.a $(NAN_ELBEEM)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libelbeem.a $(NAN_ELBEEM)/lib/debug/ + @[ -d $(NAN_ELBEEM)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ELBEEM)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libelbeem.a $(NAN_ELBEEM)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_ELBEEM)/lib/libelbeem.a - ranlib $(NAN_ELBEEM)/lib/debug/libelbeem.a + ranlib $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_ELBEEM)/include/ diff --git a/intern/ghost/Makefile b/intern/ghost/Makefile index f809a32ac8f..e983c3a9cee 100644 --- a/intern/ghost/Makefile +++ b/intern/ghost/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # ghost main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_GHOST) ] || mkdir $(NAN_GHOST) @[ -d $(NAN_GHOST)/include ] || mkdir $(NAN_GHOST)/include - @[ -d $(NAN_GHOST)/lib ] || mkdir $(NAN_GHOST)/lib - @[ -d $(NAN_GHOST)/lib/debug ] || mkdir $(NAN_GHOST)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libghost.a $(NAN_GHOST)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libghost.a $(NAN_GHOST)/lib/debug/ + @[ -d $(NAN_GHOST)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_GHOST)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libghost.a $(NAN_GHOST)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_GHOST)/lib/libghost.a - ranlib $(NAN_GHOST)/lib/debug/libghost.a + ranlib $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a endif @../tools/cpifdiff.sh *.h $(NAN_GHOST)/include/ diff --git a/intern/ghost/intern/Makefile b/intern/ghost/intern/Makefile index 467ec768720..5b95bbb3b68 100644 --- a/intern/ghost/intern/Makefile +++ b/intern/ghost/intern/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # ghost intern Makefile @@ -38,8 +40,6 @@ CCSRCS += GHOST_Rect.cpp GHOST_DisplayManager.cpp GHOST_C-api.cpp CCSRCS += GHOST_CallbackEventConsumer.cpp CCSRCS += GHOST_NDOFManager.cpp -include nan_definitions.mk - ifeq ($(OS),$(findstring $(OS), "darwin")) CCSRCS += $(wildcard *Carbon.cpp) endif diff --git a/intern/guardedalloc/Makefile b/intern/guardedalloc/Makefile index f0cef3d222c..55894d54c8e 100644 --- a/intern/guardedalloc/Makefile +++ b/intern/guardedalloc/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # decimation main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_GUARDEDALLOC) ] || mkdir $(NAN_GUARDEDALLOC) @[ -d $(NAN_GUARDEDALLOC)/include ] || mkdir $(NAN_GUARDEDALLOC)/include - @[ -d $(NAN_GUARDEDALLOC)/lib ] || mkdir $(NAN_GUARDEDALLOC)/lib - @[ -d $(NAN_GUARDEDALLOC)/lib/debug ] || mkdir $(NAN_GUARDEDALLOC)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/debug/ + @[ -d $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a - ranlib $(NAN_GUARDEDALLOC)/lib/debug/libguardedalloc.a + ranlib $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR)libguardedalloc.a endif @../tools/cpifdiff.sh *.h $(NAN_GUARDEDALLOC)/include/ diff --git a/intern/iksolver/Makefile b/intern/iksolver/Makefile index a6cfa88eb30..09e6e3a1c2a 100644 --- a/intern/iksolver/Makefile +++ b/intern/iksolver/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # iksolver main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_IKSOLVER) ] || mkdir $(NAN_IKSOLVER) @[ -d $(NAN_IKSOLVER)/include ] || mkdir $(NAN_IKSOLVER)/include - @[ -d $(NAN_IKSOLVER)/lib ] || mkdir $(NAN_IKSOLVER)/lib - @[ -d $(NAN_IKSOLVER)/lib/debug ] || mkdir $(NAN_IKSOLVER)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libiksolver.a $(NAN_IKSOLVER)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libiksolver.a $(NAN_IKSOLVER)/lib/debug/ + @[ -d $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libiksolver.a $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_IKSOLVER)/lib/libiksolver.a - ranlib $(NAN_IKSOLVER)/lib/debug/libiksolver.a + ranlib $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_IKSOLVER)/include/ diff --git a/intern/memutil/Makefile b/intern/memutil/Makefile index 787ca4fd58f..50aa0528f31 100644 --- a/intern/memutil/Makefile +++ b/intern/memutil/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # memutil main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_MEMUTIL) ] || mkdir $(NAN_MEMUTIL) @[ -d $(NAN_MEMUTIL)/include ] || mkdir $(NAN_MEMUTIL)/include - @[ -d $(NAN_MEMUTIL)/lib ] || mkdir $(NAN_MEMUTIL)/lib - @[ -d $(NAN_MEMUTIL)/lib/debug ] || mkdir $(NAN_MEMUTIL)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libmemutil.a $(NAN_MEMUTIL)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libmemutil.a $(NAN_MEMUTIL)/lib/debug + @[ -d $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libmemutil.a $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_MEMUTIL)/lib/libmemutil.a - ranlib $(NAN_MEMUTIL)/lib/debug/libmemutil.a + ranlib $(NAN_MEMUTIL)/lib/$(DEBUG_DIR)libmemutil.a endif @../tools/cpifdiff.sh *.h $(NAN_MEMUTIL)/include/ diff --git a/intern/moto/Makefile b/intern/moto/Makefile index 7bd7ea10abc..3ad4fde9c4e 100644 --- a/intern/moto/Makefile +++ b/intern/moto/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # moto main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_MOTO) ] || mkdir $(NAN_MOTO) @[ -d $(NAN_MOTO)/include ] || mkdir $(NAN_MOTO)/include - @[ -d $(NAN_MOTO)/lib ] || mkdir $(NAN_MOTO)/lib - @[ -d $(NAN_MOTO)/lib/debug ] || mkdir $(NAN_MOTO)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libmoto.a $(NAN_MOTO)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libmoto.a $(NAN_MOTO)/lib/debug/ + @[ -d $(NAN_MOTO)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_MOTO)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libmoto.a $(NAN_MOTO)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_MOTO)/lib/libmoto.a - ranlib $(NAN_MOTO)/lib/debug/libmoto.a + ranlib $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a endif @../tools/cpifdiff.sh include/*.h $(NAN_MOTO)/include/ diff --git a/intern/opennl/Makefile b/intern/opennl/Makefile index a84fd135d1d..023491792db 100644 --- a/intern/opennl/Makefile +++ b/intern/opennl/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # opennl main makefile. @@ -40,25 +42,19 @@ DIRS = intern superlu include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_OPENNL) ] || mkdir $(NAN_OPENNL) @[ -d $(NAN_OPENNL)/include ] || mkdir $(NAN_OPENNL)/include - @[ -d $(NAN_OPENNL)/lib ] || mkdir $(NAN_OPENNL)/lib - @[ -d $(NAN_OPENNL)/lib/debug ] || mkdir $(NAN_OPENNL)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libopennl.a $(NAN_OPENNL)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libopennl.a $(NAN_OPENNL)/lib/debug/ + @[ -d $(NAN_OPENNL)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_OPENNL)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libopennl.a $(NAN_OPENNL)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_OPENNL)/lib/libopennl.a - ranlib $(NAN_OPENNL)/lib/debug/libopennl.a + ranlib $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_OPENNL)/include/ @[ -d $(NAN_SUPERLU) ] || mkdir $(NAN_SUPERLU) - @[ -d $(NAN_SUPERLU)/lib ] || mkdir $(NAN_SUPERLU)/lib - @[ -d $(NAN_SUPERLU)/lib/debug ] || mkdir $(NAN_SUPERLU)/lib/debug - @../tools/cpifdiff.sh $(DIR_SLU)/libsuperlu.a $(NAN_SUPERLU)/lib/ - @../tools/cpifdiff.sh $(DIR_SLU)/debug/libsuperlu.a $(NAN_SUPERLU)/lib/debug/ + @[ -d $(NAN_SUPERLU)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SUPERLU)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR_SLU)/$(DEBUG_DIR)libsuperlu.a $(NAN_SUPERLU)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_SUPERLU)/lib/libsuperlu.a - ranlib $(NAN_SUPERLU)/lib/debug/libsuperlu.a + ranlib $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a endif diff --git a/intern/string/Makefile b/intern/string/Makefile index e885b87babe..7972defd406 100644 --- a/intern/string/Makefile +++ b/intern/string/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # string main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_STRING) ] || mkdir $(NAN_STRING) @[ -d $(NAN_STRING)/include ] || mkdir $(NAN_STRING)/include - @[ -d $(NAN_STRING)/lib ] || mkdir $(NAN_STRING)/lib - @[ -d $(NAN_STRING)/lib/debug ] || mkdir $(NAN_STRING)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libstring.a $(NAN_STRING)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libstring.a $(NAN_STRING)/lib/debug/ + @[ -d $(NAN_STRING)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_STRING)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libstring.a $(NAN_STRING)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_STRING)/lib/libstring.a - ranlib $(NAN_STRING)/lib/debug/libstring.a + ranlib $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a endif @../tools/cpifdiff.sh *.h $(NAN_STRING)/include/ diff --git a/source/Makefile b/source/Makefile index e8ec090255c..b81f0c4e5ed 100644 --- a/source/Makefile +++ b/source/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -53,7 +55,7 @@ ifdef NAN_BUILDINFO BUILDINFO_C = $(SRCHOME)/creator/buildinfo.c BUILD_DATE := $(shell date "+%Y-%m-%d") BUILD_TIME := $(shell date "+%H:%M:%S") - BUILD_REV := $(shell svnversion) + BUILD_REV := $(shell svnversion) endif ############# set pyplayerlib ################## @@ -97,13 +99,13 @@ COMLIB += $(OCGDIR)/blender/nodes_tex/$(DEBUG_DIR)libnodes_tex.a COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a -COMLIB += $(NAN_IKSOLVER)/lib/libiksolver.a -COMLIB += $(NAN_MOTO)/lib/libmoto.a -COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a +COMLIB += $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a +COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a +COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a COMLIB += $(NAN_JPEG)/lib/libjpeg.a COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a -COMLIB += $(NAN_GLEW)/lib/libglew.a +COMLIB += $(NAN_GLEW)/lib/$(DEBUG_DIR)libglew.a COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a ifneq ($(NAN_NO_KETSJI),true) @@ -114,7 +116,7 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a COMLIB += $(NAN_SOLID)/lib/libsolid.a - COMLIB += $(NAN_SOLID)/lib/libsolid_broad.a + COMLIB += $(NAN_SOLID)/lib/libsolid_broad.a COMLIB += $(NAN_SOLID)/lib/libsolid_complex.a COMLIB += $(NAN_SOLID)/lib/libsolid_convex.a COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a @@ -193,7 +195,7 @@ ifeq ($(WITH_FREETYPE2), true) COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib endif else - COMLIB += $(NAN_FTGL)/lib/libftgl.a + COMLIB += $(NAN_FTGL)/lib/$(DEBUG_DIR)libftgl.a ifeq ($(OS), irix) COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a else @@ -221,39 +223,39 @@ endif # note: space_api.a in begin of editors, screen.a in end PULIB = $(NAN_MOTO)/lib/libmoto.a -PULIB += $(NAN_DECIMATION)/lib/libdecimation.a +PULIB += $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a -PULIB += $(OCGDIR)/blender/ed_space/libed_space.a -PULIB += $(OCGDIR)/blender/ed_sound/libed_sound.a -PULIB += $(OCGDIR)/blender/ed_action/libed_action.a -PULIB += $(OCGDIR)/blender/ed_nla/libed_nla.a -PULIB += $(OCGDIR)/blender/ed_script/libed_script.a -PULIB += $(OCGDIR)/blender/ed_text/libed_text.a -PULIB += $(OCGDIR)/blender/ed_sequencer/libed_sequencer.a -PULIB += $(OCGDIR)/blender/ed_file/libed_file.a -PULIB += $(OCGDIR)/blender/ed_info/libed_info.a -PULIB += $(OCGDIR)/blender/ed_buttons/libed_buttons.a -PULIB += $(OCGDIR)/blender/ed_node/libed_node.a -PULIB += $(OCGDIR)/blender/ed_graph/libed_graph.a -PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a -PULIB += $(OCGDIR)/blender/ed_time/libed_time.a -PULIB += $(OCGDIR)/blender/ed_preview/libed_preview.a -PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a -PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a -PULIB += $(OCGDIR)/blender/ed_object/libed_object.a -PULIB += $(OCGDIR)/blender/ed_curve/libed_curve.a -PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.a -PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a -PULIB += $(OCGDIR)/blender/ed_sculpt_paint/libed_sculpt_paint.a -PULIB += $(OCGDIR)/blender/ed_physics/libed_physics.a -PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a -PULIB += $(OCGDIR)/blender/ed_transform/libed_transform.a -PULIB += $(OCGDIR)/blender/ed_util/libed_util.a -PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a -PULIB += $(OCGDIR)/blender/ed_image/libed_image.a -PULIB += $(OCGDIR)/blender/ed_uvedit/libed_uvedit.a -PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a -PULIB += $(OCGDIR)/blender/windowmanager/libwindowmanager.a +PULIB += $(OCGDIR)/blender/ed_space/$(DEBUG_DIR)libed_space.a +PULIB += $(OCGDIR)/blender/ed_sound/$(DEBUG_DIR)libed_sound.a +PULIB += $(OCGDIR)/blender/ed_action/$(DEBUG_DIR)libed_action.a +PULIB += $(OCGDIR)/blender/ed_nla/$(DEBUG_DIR)libed_nla.a +PULIB += $(OCGDIR)/blender/ed_script/$(DEBUG_DIR)libed_script.a +PULIB += $(OCGDIR)/blender/ed_text/$(DEBUG_DIR)libed_text.a +PULIB += $(OCGDIR)/blender/ed_sequencer/$(DEBUG_DIR)libed_sequencer.a +PULIB += $(OCGDIR)/blender/ed_file/$(DEBUG_DIR)libed_file.a +PULIB += $(OCGDIR)/blender/ed_info/$(DEBUG_DIR)libed_info.a +PULIB += $(OCGDIR)/blender/ed_buttons/$(DEBUG_DIR)libed_buttons.a +PULIB += $(OCGDIR)/blender/ed_node/$(DEBUG_DIR)libed_node.a +PULIB += $(OCGDIR)/blender/ed_graph/$(DEBUG_DIR)libed_graph.a +PULIB += $(OCGDIR)/blender/ed_outliner/$(DEBUG_DIR)libed_outliner.a +PULIB += $(OCGDIR)/blender/ed_time/$(DEBUG_DIR)libed_time.a +PULIB += $(OCGDIR)/blender/ed_preview/$(DEBUG_DIR)libed_preview.a +PULIB += $(OCGDIR)/blender/ed_view3d/$(DEBUG_DIR)libed_view3d.a +PULIB += $(OCGDIR)/blender/ed_interface/$(DEBUG_DIR)libed_interface.a +PULIB += $(OCGDIR)/blender/ed_object/$(DEBUG_DIR)libed_object.a +PULIB += $(OCGDIR)/blender/ed_curve/$(DEBUG_DIR)libed_curve.a +PULIB += $(OCGDIR)/blender/ed_armature/$(DEBUG_DIR)libed_armature.a +PULIB += $(OCGDIR)/blender/ed_mesh/$(DEBUG_DIR)libed_mesh.a +PULIB += $(OCGDIR)/blender/ed_sculpt_paint/$(DEBUG_DIR)libed_sculpt_paint.a +PULIB += $(OCGDIR)/blender/ed_physics/$(DEBUG_DIR)libed_physics.a +PULIB += $(OCGDIR)/blender/ed_animation/$(DEBUG_DIR)libed_animation.a +PULIB += $(OCGDIR)/blender/ed_transform/$(DEBUG_DIR)libed_transform.a +PULIB += $(OCGDIR)/blender/ed_util/$(DEBUG_DIR)libed_util.a +PULIB += $(OCGDIR)/blender/ed_datafiles/$(DEBUG_DIR)libed_datafiles.a +PULIB += $(OCGDIR)/blender/ed_image/$(DEBUG_DIR)libed_image.a +PULIB += $(OCGDIR)/blender/ed_uvedit/$(DEBUG_DIR)libed_uvedit.a +PULIB += $(OCGDIR)/blender/ed_screen/$(DEBUG_DIR)libed_screen.a +PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a # note, no idea but it suddenly doesn't compile :( @@ -262,7 +264,7 @@ PULIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a ifeq ($(NAN_NO_KETSJI),true) - PULIB += $(NAN_MOTO)/lib/libmoto.a + PULIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a PULIB += $(OCGDIR)/kernel/gen_system/$(DEBUG_DIR)libgen_system.a PULIB += $(OCGDIR)/kernel/gen_messaging/$(DEBUG_DIR)libgen_messaging.a COMLIB += $(NAN_SND_LIBS) @@ -317,7 +319,7 @@ PLUGAPPLIB += $(OCGDIR)/gameengine/GamePlayer/common/$(DEBUG_DIR)libcommon.a ifeq ($(OS),$(findstring $(OS), "linux")) ifeq ($(CPU),i386) - PLUGAPPLIB_XPLINK = $(OCGDIR)/gameengine/GamePlayer/netscape/src/$(DEBUG_DIR)_Blender3DPlugin_implementation_.o + PLUGAPPLIB_XPLINK = $(OCGDIR)/gameengine/GamePlayer/netscape/src/$(DEBUG_DIR)_Blender3DPlugin_implementation_.o endif endif @@ -381,7 +383,7 @@ else NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a - ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a) + ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a) NAN_SND_LIBS += $(ALUT) NAN_SND_LIBS += $(SOUNDSYSTEM) else @@ -391,7 +393,7 @@ else NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib - ALUT = $(wildcard $(NAN_OPENAL)/lib/alut_static.lib) + ALUT = $(wildcard $(NAN_OPENAL)/lib/alut_static.lib) NAN_SND_LIBS += $(ALUT) NAN_SND_LIBS += $(SOUNDSYSTEM) else @@ -550,7 +552,7 @@ ifeq ($(OS), darwin) @$(MAKE) -C darwin/ APPLICATION=blenderstatic endif -$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) +$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) @echo "****> Link $@" ifdef NAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO @@ -640,4 +642,3 @@ endif ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif - diff --git a/source/nan_compile.mk b/source/nan_compile.mk index 0ac712b3a18..a2fcfad3a9e 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 9ca458e8371..60fc56408b2 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -31,14 +33,25 @@ sinclude ../user-def.mk +# This warning only takes place once in source/ +ifeq (debug, $(findstring debug, $(MAKECMDGOALS))) + ifeq (all, $(findstring all, $(MAKECMDGOALS))) + export ERRTXT = "ERROR: all and debug targets cannot be used together anymore" + export ERRTXT += "Use something like ..make all && make debug.. instead" + endif +endif + +ifdef ERRTXT +$(error $(ERRTXT)) +endif + ifndef CONFIG_GUESS ifeq (debug, $(findstring debug, $(MAKECMDGOALS))) - ifeq (all, $(findstring all, $(MAKECMDGOALS))) -all debug:: - ERRTXT = "ERROR: all and debug targets cannot be used together anymore" - ERRTXT += "Use something like ..make all && make debug.. instead" - $(error $(ERRTXT)) - endif + export DEBUG_DIR = debug/ + export ALL_OR_DEBUG = debug + endif + ifeq (all, $(findstring all, $(MAKECMDGOALS))) + export ALL_OR_DEBUG ?= all endif # First generic defaults for all platforms which should be constant. @@ -158,9 +171,9 @@ endif endif endif endif - ifeq ($(WITH_OPENEXR), true) - export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR - endif + ifeq ($(WITH_OPENEXR), true) + export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR + endif endif # Platform Dependent settings go below: diff --git a/source/nan_link.mk b/source/nan_link.mk index e92103f56d9..42b17b425b3 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # diff --git a/source/nan_subdirs.mk b/source/nan_subdirs.mk index 85360eab7bc..c33e0fa2ccc 100644 --- a/source/nan_subdirs.mk +++ b/source/nan_subdirs.mk @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # diff --git a/source/nan_warn.mk b/source/nan_warn.mk index 97a8bbf09e4..5841cdf5908 100644 --- a/source/nan_warn.mk +++ b/source/nan_warn.mk @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # |