One more cleanup for MSVC - need separation for debug/release because MSVC can't...
authorKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>
Sat, 17 Jul 2004 04:59:25 +0000 (04:59 +0000)
committerKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>
Sat, 17 Jul 2004 04:59:25 +0000 (04:59 +0000)
extern/Makefile
extern/solid/Makefile [new file with mode: 0755]
extern/solid/src/Makefile
extern/solid/src/broad/Makefile
extern/solid/src/complex/Makefile
extern/solid/src/convex/Makefile

index aa52317b98e1d59193832e629c6928bcf8bc4d84..ef2bb518dad0341337a9eeb5a73541047f55e039 100644 (file)
@@ -34,7 +34,7 @@ include nan_definitions.mk
 
 SOURCEDIR = extern
 DIR = $(OCGDIR)/extern
-DIRS = qhull/src solid/src ode
+DIRS = qhull/src solid
 
 TARGET =
 ifneq ($(OS),irix)
diff --git a/extern/solid/Makefile b/extern/solid/Makefile
new file mode 100755 (executable)
index 0000000..1674771
--- /dev/null
@@ -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
+
+
index 4623614cbb235ca3c24d4e3a52f32be16ac48e9b..451431ced3b452ffdccc2e0f247821dc032c287e 100644 (file)
@@ -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
-
-
index 28f0c578d32c6a0fbbcbe27c7e8c192bd8498bb2..90445c3cd7a1f45e3d9e58cac25f47c959888636 100644 (file)
@@ -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
index 7b026bcec3205675c40680d4aaef1b7cabfb399e..99e786276b005801a360a7212ad4e5662bfabfe9 100644 (file)
@@ -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
+
index b71f53401da1e7c61a59bc03903e97b03d61ebae..406a89f29896ac9182be6732fa3f1a0a5da3dffe 100644 (file)
@@ -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
-