started whiping cmake into shape for 2.5 still need to figure out

the rna stuff but its close. Need to get it working for blender then copy over same to game engine. Kent
2008-12-12 20:41:30 +00:00 · 2008-12-12 20:41:30 +00:00 · e8effb2d0f
commit e8effb2d0f
parent 0956f78d69
9 changed files with 87 additions and 21 deletions
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna python radiosity readblenfile render yafray)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna python radiosity readblenfile render yafray)

 IF(WITH_INTERNATIONAL)
  SUBDIRS(ftfont)
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@ -29,13 +29,13 @@ FILE(GLOB SRC */*.c)
 SET(INC ../windowmanager
  ../editors/include
  ../../../intern/guardedalloc ../../../intern/memutil
-  ../blenlib ../makesdna ../blenkernel
+  ../blenlib ../makesdna ../makesrna ../blenkernel
  ../include ../../../intern/bmfont ../imbuf ../render/extern/include
  ../../../intern/bsp/extern ../radiosity/extern/include
  ../../../intern/decimation/extern ../blenloader ../python
  ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
  ../quicktime ../../../intern/elbeem/extern
-  ../../../intern/ghost ../../../intern/opennl/extern
+  ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
  ../nodes
  ${PYTHON_INC}
  ${SDL_INC}
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@ -29,23 +29,24 @@

 FILE(GLOB SRC */*.c)

-SET(INC ../windowmanager
-  ../editors/include
-  ../../../intern/guardedalloc ../../../intern/memutil
-  ../blenlib ../makesdna ../blenkernel
-  ../include ../../../intern/bmfont ../imbuf ../render/extern/include
-  ../../../intern/bsp/extern ../radiosity/extern/include
-  ../../../intern/decimation/extern ../blenloader ../python
-  ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
-  ../quicktime ../../../intern/elbeem/extern
-  ../../../intern/ghost ../../../intern/opennl/extern
-  ../nodes
+SET(INC ../../windowmanager
+  ../../editors/include
+  ../../../../intern/guardedalloc ../../../../intern/memutil
+  ../../blenlib ../../makesdna ../../makesrna ../../blenkernel
+  ../../include ../../../../intern/bmfont ../../imbuf 
+  ../../render/extern/include ../../../../intern/bsp/extern 
+  ../../radiosity/extern/include
+  ../../../intern/decimation/extern ../../blenloader ../../python
+  ../../../kernel/gen_system ../../../../intern/SoundSystem ../../readstreamglue
+  ../../quicktime ../../../../intern/elbeem/extern
+  ../../../../intern/ghost ../../../../intern/opennl/extern
+  ../../nodes
  ${PYTHON_INC}
  ${SDL_INC}
 )

 IF(WITH_INTERNATIONAL)
-  SET(INC ${INC} ../ftfont)
+  SET(INC ${INC} ../../ftfont)
  ADD_DEFINITIONS(-DINTERNATIONAL)
  ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY)
 ENDIF(WITH_INTERNATIONAL)
--- a/source/blender/makesrna/CMakeLists.txt
+++ b/source/blender/makesrna/CMakeLists.txt
@ -0,0 +1,27 @@
+# $Id: CMakeLists.txt 13161 2008-01-07 19:13:47Z 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 *****
+
+SUBDIRS(intern)
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@ -0,0 +1,34 @@
+# $Id: CMakeLists.txt 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) 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 *.c ../../../../intern/guardedalloc/intern/mallocn.c ../../../../intern/guardedalloc/intern/mmap_win.c)
+
+INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..)
+
+FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
+ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES})
+
+MESSAGE(STATUS "Configuring makesrna")
--- a/source/blender/python/CMakeLists.txt
+++ b/source/blender/python/CMakeLists.txt
@ -26,8 +26,8 @@
 FILE(GLOB SRC intern/*.c)

 SET(INC 
-  . ../../../intern/guardedalloc ../blenlib ../makesdna
-  ../blenkernel ../editors/include
+  . ../../../intern/guardedalloc ../blenlib ../makesdna ../makesrna
+  ../blenkernel ../editors/include ${PYTHON_INC}
 )

 IF(WITH_VERSE)
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@ -29,13 +29,13 @@ FILE(GLOB SRC intern/*.c)
 SET(INC .
  ../editors/include
  ../../../intern/guardedalloc ../../../intern/memutil
-  ../blenlib ../makesdna ../blenkernel
+  ../blenlib ../makesdna ../makesrna ../blenkernel
  ../include ../../../intern/bmfont ../imbuf ../render/extern/include
  ../../../intern/bsp/extern ../radiosity/extern/include
  ../../../intern/decimation/extern ../blenloader ../python
  ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
  ../quicktime ../../../intern/elbeem/extern
-  ../../../intern/ghost ../../../intern/opennl/extern
+  ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
  ../nodes
  ${PYTHON_INC}
  ${SDL_INC}
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@ -65,12 +65,15 @@ ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
  DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/rna.c
+  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/rna.c ${CMAKE_SOURCE_DIR}/source/blender/makesrna/
+  DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna
 )

 IF(WIN32)
-  ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
+  ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/rna.c ../icons/winblender.rc)
 ELSE(WIN32)
-  ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
+  ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/rna.c)
 ENDIF(WIN32)


--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@ -39,6 +39,7 @@ SET(INC
  ../../../source/blender/blenlib
  ../../../source/blender/blenkernel
  ../../../source/blender/makesdna
+  ../../../source/blender/editors/include
  ../../../source/blender/imbuf
  ../../../source/blender/python
  ../../../source/blender/gpu