forked from bartvdbraak/blender
Tweaks to get yafray stuff working with Makefiles
Kent
This commit is contained in:
parent
56db828948
commit
a017282b62
@ -134,6 +134,7 @@ PYPLAYERLIB ?= $(PYLIB)
|
||||
COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
|
||||
COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a
|
||||
COMLIB += $(NAN_PNG)/lib/libpng.a
|
||||
COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a
|
||||
ifeq ($(WITH_QUICKTIME), true)
|
||||
COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a
|
||||
endif
|
||||
|
@ -37,7 +37,7 @@ DIRS = blenloader
|
||||
DIRS += deflate inflate
|
||||
DIRS += writestreamglue readstreamglue writeblenfile readblenfile
|
||||
DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi
|
||||
DIRS += makesdna src renderconverter
|
||||
DIRS += makesdna src renderconverter yafray
|
||||
DIRS += python
|
||||
|
||||
ifeq ($(INTERNATIONAL), true)
|
||||
|
@ -53,6 +53,7 @@ CPPFLAGS += -I../../../imbuf
|
||||
CPPFLAGS += -I../../../makesdna
|
||||
CPPFLAGS += -I../../../blenkernel
|
||||
CPPFLAGS += -I../../../quicktime
|
||||
CPPFLAGS += -I../../../yafray
|
||||
CPPFLAGS += -I../../../../kernel/gen_messaging
|
||||
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
||||
# not very neat: the rest of blender..
|
||||
|
34
source/blender/yafray/Makefile
Normal file
34
source/blender/yafray/Makefile
Normal file
@ -0,0 +1,34 @@
|
||||
# ***** 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 *****
|
||||
#
|
||||
# Bounces make to subdirectories.
|
||||
|
||||
SOURCEDIR = source/blender/yafray
|
||||
DIRS = intern
|
||||
|
||||
include nan_subdirs.mk
|
49
source/blender/yafray/intern/Makefile
Normal file
49
source/blender/yafray/intern/Makefile
Normal file
@ -0,0 +1,49 @@
|
||||
# ***** 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 *****
|
||||
#
|
||||
#
|
||||
|
||||
LIBNAME = yafrayexport
|
||||
DIR = $(OCGDIR)/blender/yafray
|
||||
|
||||
include nan_compile.mk
|
||||
|
||||
ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
|
||||
CFLAGS += -funsigned-char
|
||||
endif
|
||||
|
||||
CFLAGS += $(LEVEL_1_C_WARNINGS)
|
||||
|
||||
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
||||
CPPFLAGS += -I../../makesdna
|
||||
CPPFLAGS += -I../../blenkernel
|
||||
CPPFLAGS += -I../../blenlib
|
||||
CPPFLAGS += -I../../render/extern/include
|
||||
CPPFLAGS += -I../../imbuf
|
||||
CPPFLAGS += -I../../include
|
||||
CPPFLAGS += -I..
|
Loading…
Reference in New Issue
Block a user