From 5ff83fa2b8c63a9267722f01b5626ee0da41adda Mon Sep 17 00:00:00 2001
From: Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>
Date: Sat, 17 Jul 2004 04:59:25 +0000
Subject: One more cleanup for MSVC - need separation for debug/release because
 MSVC can't handle debug and optimisation flags at the same time.

---
 extern/solid/src/Makefile         | 20 --------------------
 extern/solid/src/broad/Makefile   | 10 ----------
 extern/solid/src/complex/Makefile | 11 +----------
 extern/solid/src/convex/Makefile  | 11 -----------
 4 files changed, 1 insertion(+), 51 deletions(-)

(limited to 'extern/solid/src')

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
-
 
-- 
cgit v1.2.3