diff options
| -rw-r--r-- | intern/Makefile | 2 | ||||
| -rw-r--r-- | intern/smoke/Makefile | 54 | ||||
| -rw-r--r-- | intern/smoke/intern/Makefile | 52 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/Makefile | 2 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 1 |
5 files changed, 109 insertions, 2 deletions
diff --git a/intern/Makefile b/intern/Makefile index 995dc56c7d3..b559ce6978a 100644 --- a/intern/Makefile +++ b/intern/Makefile @@ -32,7 +32,7 @@ SOURCEDIR = intern # include nan_subdirs.mk ALLDIRS = string ghost guardedalloc moto container memutil -ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop +ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop smoke all:: @for i in $(ALLDIRS); do \ diff --git a/intern/smoke/Makefile b/intern/smoke/Makefile new file mode 100644 index 00000000000..a8bddd6f8e6 --- /dev/null +++ b/intern/smoke/Makefile @@ -0,0 +1,54 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 +# +# $Id: Makefile 19330 2009-03-19 01:50:45Z hos $ +# +# ***** BEGIN GPL 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. +# +# 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): Hans Lambermont, GSR +# +# ***** END GPL LICENSE BLOCK ***** +# smoke main makefile. +# + +include nan_definitions.mk + +unexport NAN_QUIET + +LIBNAME = smoke +SOURCEDIR = intern/$(LIBNAME) +DIR = $(OCGDIR)/$(SOURCEDIR) +DIRS = intern +#not ready yet TESTDIRS = test + +include nan_subdirs.mk + +install: $(ALL_OR_DEBUG) + @[ -d $(NAN_SMOKE) ] || mkdir $(NAN_SMOKE) + @[ -d $(NAN_SMOKE)/include ] || mkdir $(NAN_SMOKE)/include + @[ -d $(NAN_SMOKE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SMOKE)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_SMOKE)/lib/$(DEBUG_DIR) +ifeq ($(OS),darwin) + ranlib $(NAN_SMOKE)/lib/$(DEBUG_DIR)lib$(LIBNAME).a +endif + @../tools/cpifdiff.sh extern/*.h $(NAN_SMOKE)/include/ + diff --git a/intern/smoke/intern/Makefile b/intern/smoke/intern/Makefile new file mode 100644 index 00000000000..64561588d54 --- /dev/null +++ b/intern/smoke/intern/Makefile @@ -0,0 +1,52 @@ +# +# $Id: Makefile 17433 2008-11-12 21:16:53Z blendix $ +# +# ***** BEGIN GPL 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. +# +# 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 LICENSE BLOCK ***** +# smoke intern Makefile +# + +LIBNAME = smoke +DIR = $(OCGDIR)/intern/$(LIBNAME) + +include nan_compile.mk + +unexport NAN_QUIET + +CCFLAGS += $(LEVEL_2_CPP_WARNINGS) + +ifeq ($(WITH_BF_OPENMP),true) + CPPFLAGS += -DPARALLEL +endif + +CPPFLAGS += -I. +CPPFLAGS += -I../extern +CPPFLAGS += -I$(NAN_PNG)/include +CPPFLAGS += -I$(NAN_PNG)/include/libpng + +# zlib +ifeq ($(OS),$(findstring $(OS), "solaris windows")) + CPPFLAGS += -I$(NAN_ZLIB)/include +endif diff --git a/source/blender/editors/space_view3d/Makefile b/source/blender/editors/space_view3d/Makefile index 5e6f8a6c426..07102157854 100644 --- a/source/blender/editors/space_view3d/Makefile +++ b/source/blender/editors/space_view3d/Makefile @@ -52,7 +52,7 @@ CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../render/extern/include CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include - +CPPFLAGS += -I$(NAN_SMOKE)/include # own include CPPFLAGS += -I../include diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index fc0f3a7aa19..4724c740ffc 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -107,6 +107,7 @@ endif export NAN_TEST_VERBOSITY ?= 1 export NAN_OPENNL ?= $(LCGDIR)/opennl export NAN_ELBEEM ?= $(LCGDIR)/elbeem + export NAN_SMOKE ?= $(LCGDIR)/smoke export NAN_SUPERLU ?= $(LCGDIR)/superlu export NAN_GLEW ?= $(LCGDIR)/glew ifeq ($(FREE_WINDOWS), true) |