[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13183] branches/blender2.5/blender: update to cmake files

[Andrea Weikert]

Revision: 13183
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13183
Author:   elubie
Date:     2008-01-09 19:48:04 +0100 (Wed, 09 Jan 2008)

Log Message:
-----------
update to cmake files
- added python library
- small fix for ignored runtime library, needed for linking debug here
Note: still some problems linking with openexr in debug

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt
    branches/blender2.5/blender/source/blender/editors/screen/stubs.c

Added Paths:
-----------
    branches/blender2.5/blender/source/blender/python/CMakeLists.txt

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2008-01-09 18:26:17 UTC (rev 13182)
+++ branches/blender2.5/blender/CMakeLists.txt	2008-01-09 18:48:04 UTC (rev 13183)
@@ -286,7 +286,7 @@
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib")
-  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib ")
+  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
 ENDIF(WIN32)
 
 IF(APPLE)

Modified: branches/blender2.5/blender/source/blender/editors/screen/stubs.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/stubs.c	2008-01-09 18:26:17 UTC (rev 13182)
+++ branches/blender2.5/blender/source/blender/editors/screen/stubs.c	2008-01-09 18:48:04 UTC (rev 13183)
@@ -49,8 +49,6 @@
 void BPY_post_start_python() {}
 void BPY_run_python_script() {}
 void BPY_start_python() {}
-void BPY_copy_scriptlink() {}
-void BPY_free_scriptlink() {}
 void BPY_do_all_scripts() {}
 void BPY_call_importloader() {}
 void BPY_do_pyscript() {}

Added: branches/blender2.5/blender/source/blender/python/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/python/CMakeLists.txt	                        (rev 0)
+++ branches/blender2.5/blender/source/blender/python/CMakeLists.txt	2008-01-09 18:48:04 UTC (rev 13183)
@@ -0,0 +1,63 @@
+# ***** 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 
+  . ../../../intern/guardedalloc ../blenlib ../makesdna
+  ../blenkernel ../editors/include
+)
+
+IF(WITH_VERSE)
+  ADD_DEFINITIONS(-DWITH_VERSE)
+  SET(INC ${INC} ${VERSE_INC})
+ENDIF(WITH_VERSE)
+
+IF(WITH_OPENEXR)
+  ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
+IF(WITH_QUICKTIME)
+  SET(INC ${INC} ${QUICKTIME_INC})
+  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+ENDIF(WITH_QUICKTIME)
+
+IF(WITH_FFMPEG)
+  SET(INC ${INC} ${FFMPEG_INC})
+  ADD_DEFINITIONS(-DWITH_FFMPEG)
+ENDIF(WITH_FFMPEG)
+
+ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
+
+BLENDERLIB(bf_python "${SRC}" "${INC}")
+
+IF(WITH_VERSE)
+  ADD_DEPENDENCIES(bf_nodes mkprot verse)
+ENDIF(WITH_VERSE)
+
+IF(WITH_INTERNATIONAL)
+   ADD_DEFINITIONS(-DWITH_FREETYPE2)
+ENDIF(WITH_INTERNATIONAL)
+