One more cleanup for MSVC - need separation for debug/release because MSVC can't handle debug and optimisation flags at the same time.

5 files changed, 58 insertions, 51 deletions

diff --git a/extern/solid/Makefile b/extern/solid/Makefile
new file mode 100755
index 00000000000..1674771537e
--- /dev/null
+++ b/extern/solid/Makefile
@@ -0,0 +1,57 @@
+#
+# $Id$
+#
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License.  See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+#
+#
+
+LIBNAMES = solid solid_broad solid_convex solid_complex
+DIR = $(OCGDIR)/extern/
+DIRS = src
+
+include nan_subdirs.mk
+
+install: all 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
+	@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/ ; \
+	    if [ $(OS) = darwin ] ; then \
+            ranlib $(NAN_SOLID)/lib/lib$$i.a ; \
+            ranlib $(NAN_SOLID)/lib/debug/lib$$i.a ; \
+        fi ; \
+	done
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh include/*.h $(NAN_SOLID)/include/SOLID
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh include/MT/*.h $(NAN_SOLID)/include/SOLID/MT
+
+
diff --git a/extern/solid/src/Makefile b/extern/solid/src/Makefile
index 4623614cbb2..451431ced3b 100644
--- a/extern/solid/src/Makefile
+++ b/extern/solid/src/Makefile
@@ -45,23 +45,3 @@ CPPFLAGS += -DQHULL -DUSE_DOUBLES
 
 include nan_compile.mk 
 
-install: all 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
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_SOLID)/lib/
-#	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/debug/lib$(LIBNAME).a $(NAN_SOLID)/lib/debug/
-ifeq ($(OS),darwin)
-	ranlib $(NAN_SOLID)/lib/lib$(LIBNAME).a
-	ranlib $(NAN_SOLID)/lib/debug/lib$(LIBNAME).a
-endif
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/*.h $(NAN_SOLID)/include/SOLID
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/MT/*.h $(NAN_SOLID)/include/SOLID/MT
-	@for i in $(DIRS); do \
-	    echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
-	    $(MAKE) -C $$i install || exit 1; \
-	done
-
-
diff --git a/extern/solid/src/broad/Makefile b/extern/solid/src/broad/Makefile
index 28f0c578d32..90445c3cd7a 100644
--- a/extern/solid/src/broad/Makefile
+++ b/extern/solid/src/broad/Makefile
@@ -42,13 +42,3 @@ CPPFLAGS += -DQHULL -DUSE_DOUBLES
 include nan_compile.mk 
 
 
-install: all debug
-	@[ -d $(NAN_SOLID) ] || mkdir $(NAN_SOLID)
-	@[ -d $(NAN_SOLID)/lib ] || mkdir $(NAN_SOLID)/lib
-	@[ -d $(NAN_SOLID)/lib/debug ] || mkdir $(NAN_SOLID)/lib/debug
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_SOLID)/lib/
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/debug/lib$(LIBNAME).a $(NAN_SOLID)/lib/debug/
-ifeq ($(OS),darwin)
-	ranlib $(NAN_SOLID)/lib/lib$(LIBNAME).a
-	ranlib $(NAN_SOLID)/lib/debug/lib$(LIBNAME).a
-endif
diff --git a/extern/solid/src/complex/Makefile b/extern/solid/src/complex/Makefile
index 7b026bcec32..99e786276b0 100644
--- a/extern/solid/src/complex/Makefile
+++ b/extern/solid/src/complex/Makefile
@@ -42,13 +42,4 @@ CPPFLAGS += -DQHULL -DUSE_DOUBLES
 
 include nan_compile.mk 
 
-install: all debug
-	@[ -d $(NAN_SOLID) ] || mkdir $(NAN_SOLID)
-	@[ -d $(NAN_SOLID)/lib ] || mkdir $(NAN_SOLID)/lib
-	@[ -d $(NAN_SOLID)/lib/debug ] || mkdir $(NAN_SOLID)/lib/debug
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_SOLID)/lib/
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/debug/lib$(LIBNAME).a $(NAN_SOLID)/lib/debug/
-ifeq ($(OS),darwin)
-	ranlib $(NAN_SOLID)/lib/lib$(LIBNAME).a
-	ranlib $(NAN_SOLID)/lib/debug/lib$(LIBNAME).a
-endif
+
diff --git a/extern/solid/src/convex/Makefile b/extern/solid/src/convex/Makefile
index b71f53401da..406a89f2989 100644
--- a/extern/solid/src/convex/Makefile
+++ b/extern/solid/src/convex/Makefile
@@ -41,15 +41,4 @@ CPPFLAGS += -DQHULL -DUSE_DOUBLES
 
 include nan_compile.mk 
 
-install: all debug
-	@[ -d $(NAN_SOLID) ] || mkdir $(NAN_SOLID)
-	@[ -d $(NAN_SOLID)/lib ] || mkdir $(NAN_SOLID)/lib
-	@[ -d $(NAN_SOLID)/lib/debug ] || mkdir $(NAN_SOLID)/lib/debug
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_SOLID)/lib/
-	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/debug/lib$(LIBNAME).a $(NAN_SOLID)/lib/debug/
-ifeq ($(OS),darwin)
-	ranlib $(NAN_SOLID)/lib/lib$(LIBNAME).a
-	ranlib $(NAN_SOLID)/lib/debug/lib$(LIBNAME).a
-endif
-