[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14903] branches/apricot: Apricot Branch
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue May 20 14:46:45 CEST 2008
Revision: 14903
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14903
Author: blendix
Date: 2008-05-20 14:45:54 +0200 (Tue, 20 May 2008)
Log Message:
-----------
Apricot Branch
==============
- CMake build system support for GLSL.
Modified Paths:
--------------
branches/apricot/blenderplayer/CMakeLists.txt
branches/apricot/extern/CMakeLists.txt
branches/apricot/source/blender/CMakeLists.txt
branches/apricot/source/blender/blenkernel/CMakeLists.txt
branches/apricot/source/blender/nodes/CMakeLists.txt
branches/apricot/source/blender/python/CMakeLists.txt
branches/apricot/source/blender/radiosity/CMakeLists.txt
branches/apricot/source/blender/src/CMakeLists.txt
branches/apricot/source/creator/CMakeLists.txt
branches/apricot/source/gameengine/BlenderRoutines/CMakeLists.txt
Added Paths:
-----------
branches/apricot/extern/glew/CMakeLists.txt
branches/apricot/source/blender/gpu/CMakeLists.txt
Modified: branches/apricot/blenderplayer/CMakeLists.txt
===================================================================
--- branches/apricot/blenderplayer/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/blenderplayer/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -90,6 +90,7 @@
bf_soundsystem
bf_kernel
bf_nodes
+ bf_gpu
bf_imbuf
bf_avi
kx_network
@@ -108,6 +109,7 @@
blenkernel_blc
bf_quicktime
extern_binreloc
+ extern_glew
)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
Modified: branches/apricot/extern/CMakeLists.txt
===================================================================
--- branches/apricot/extern/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/extern/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -43,3 +43,6 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SUBDIRS(binreloc)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+SUBDIRS(glew)
+
Added: branches/apricot/extern/glew/CMakeLists.txt
===================================================================
--- branches/apricot/extern/glew/CMakeLists.txt (rev 0)
+++ branches/apricot/extern/glew/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -0,0 +1,33 @@
+# $Id$
+# ***** 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) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SET(INC include src)
+
+SET(SRC
+ src/glew.c
+)
+
+BLENDERLIB(extern_glew "${SRC}" "${INC}")
Modified: branches/apricot/source/blender/CMakeLists.txt
===================================================================
--- branches/apricot/source/blender/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/source/blender/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -24,7 +24,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render src yafray)
+SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna python radiosity readblenfile render src yafray)
IF(WITH_INTERNATIONAL)
SUBDIRS(ftfont)
Modified: branches/apricot/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/apricot/source/blender/blenkernel/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/source/blender/blenkernel/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -32,7 +32,7 @@
../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
../../../intern/iksolver/extern ../blenloader ../quicktime
../../../intern/bmfont ../../../extern/bullet2/src
- ../nodes
+ ../nodes ../../../extern/glew/include ../gpu
${SDL_INC}
${ZLIB_INC}
${PYTHON_INC}
Added: branches/apricot/source/blender/gpu/CMakeLists.txt
===================================================================
--- branches/apricot/source/blender/gpu/CMakeLists.txt (rev 0)
+++ branches/apricot/source/blender/gpu/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -0,0 +1,34 @@
+# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z 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) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+FILE(GLOB SRC intern/*.c)
+
+SET(INC
+ . ../blenlib ../blenkernel ../makesdna ../include
+ ../../../extern/glew/include ../../../intern/guardedalloc ../imbuf)
+
+BLENDERLIB(bf_gpu "${SRC}" "${INC}")
+
Modified: branches/apricot/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/apricot/source/blender/nodes/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/source/blender/nodes/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -30,7 +30,7 @@
../python ../render/extern/include ../../../intern/decimation/extern
../imbuf ../avi ../../../intern/elbeem/extern
../../../intern/iksolver/extern ../blenloader ../quicktime
- ../blenkernel
+ ../blenkernel ../../../extern/glew/include ../gpu
${SDL_INC}
${ZLIB_INC}
${PYTHON_INC}
Modified: branches/apricot/source/blender/python/CMakeLists.txt
===================================================================
--- branches/apricot/source/blender/python/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/source/blender/python/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -34,7 +34,7 @@
api2_2x ../blenkernel ../blenlib ../blenloader
../render/extern/include ../radiosity/extern/include
../makesdna ../../../intern/guardedalloc ../../../intern/bmfont ../imbuf ../include
- ${PYTHON_INC}
+ ${PYTHON_INC} ../../../extern/glew/include
)
IF(WITH_QUICKTIME)
Modified: branches/apricot/source/blender/radiosity/CMakeLists.txt
===================================================================
--- branches/apricot/source/blender/radiosity/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/source/blender/radiosity/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -29,7 +29,7 @@
SET(INC
extern/include ../blenlib ../blenkernel ../makesdna ../include
../../../intern/guardedalloc ../render/extern/include
- ../render/intern/include
+ ../render/intern/include ../../../extern/glew/include
)
BLENDERLIB_NOLIST(blender_radiosity "${SRC}" "${INC}")
Modified: branches/apricot/source/blender/src/CMakeLists.txt
===================================================================
--- branches/apricot/source/blender/src/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/source/blender/src/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -35,7 +35,7 @@
../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
../quicktime ../../../intern/elbeem/extern
../../../intern/ghost ../../../intern/opennl/extern
- ../nodes
+ ../nodes ../../../extern/glew/include ../gpu
${PYTHON_INC}
${SDL_INC}
)
Modified: branches/apricot/source/creator/CMakeLists.txt
===================================================================
--- branches/apricot/source/creator/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/source/creator/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -37,8 +37,10 @@
../blender/render/extern/include
../blender/python
../blender/makesdna
+ ../blender/gpu
../kernel/gen_messaging
../kernel/gen_system
+ ../../extern/glew/include
)
@@ -210,6 +212,7 @@
blender_python
bf_blenkernel
bf_nodes
+ bf_gpu
bf_blenloader
bf_blenpluginapi
bf_imbuf
@@ -259,6 +262,7 @@
blender_python
bf_quicktime
extern_binreloc
+ extern_glew
)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
Modified: branches/apricot/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- branches/apricot/source/gameengine/BlenderRoutines/CMakeLists.txt 2008-05-20 05:55:12 UTC (rev 14902)
+++ branches/apricot/source/gameengine/BlenderRoutines/CMakeLists.txt 2008-05-20 12:45:54 UTC (rev 14903)
@@ -33,6 +33,7 @@
../../../source/blender/blenloader
../../../extern/bullet2/src
../../../extern/solid
+ ../../../extern/glew/include
${PYTHON_INC}
)
More information about the Bf-blender-cvs
mailing list