Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kester Maddock
2004-07-17 04:59:25 +00:00
parent c0985f4ceb
commit 5ff83fa2b8
6 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extern/Makefile vendored
View File

@@ -34,7 +34,7 @@ include nan_definitions.mk
SOURCEDIR = extern SOURCEDIR = extern
DIR = $(OCGDIR)/extern DIR = $(OCGDIR)/extern
DIRS = qhull/src solid/src ode DIRS = qhull/src solid
TARGET = TARGET =
ifneq ($(OS),irix) ifneq ($(OS),irix)

57
extern/solid/Makefile vendored Executable file
View File

@@ -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

20
extern/solid/src/Makefile vendored
View File

@@ -45,23 +45,3 @@ CPPFLAGS += -DQHULL -DUSE_DOUBLES
include nan_compile.mk 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

10
extern/solid/src/broad/Makefile vendored
View File

@@ -42,13 +42,3 @@ CPPFLAGS += -DQHULL -DUSE_DOUBLES
include nan_compile.mk 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

11
extern/solid/src/complex/Makefile vendored
View File

@@ -42,13 +42,4 @@ CPPFLAGS += -DQHULL -DUSE_DOUBLES
include nan_compile.mk 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

11
extern/solid/src/convex/Makefile vendored
View File

@@ -41,15 +41,4 @@ CPPFLAGS += -DQHULL -DUSE_DOUBLES
include nan_compile.mk 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