Revision: 36030
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36030
Author: campbellbarton
Date: 2011-04-06 03:02:40 +0000 (Wed, 06 Apr 2011)
Log Message:
-----------
fix for cmake glew includes (tested with mingw), also made qtcreator project
generator work with mingw again
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_qtcreator_project.py
trunk/blender/source/blender/editors/animation/CMakeLists.txt
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/space_action/CMakeLists.txt
trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
trunk/blender/source/blender/editors/space_console/CMakeLists.txt
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_info/CMakeLists.txt
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_time/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/transform/CMakeLists.txt
trunk/blender/source/blender/editors/uvedit/CMakeLists.txt
Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-04-06
01:51:43 UTC (rev 36029)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-04-06
03:02:40 UTC (rev 36030)
@@ -114,10 +114,11 @@
"""
def create_eclipse_project(CMAKE_DIR):
+ print("CMAKE_DIR %r" % CMAKE_DIR)
if sys.platform == "win32":
- cmd = 'cmake %r -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
+ cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
else:
- cmd = 'cmake %r -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
+ cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
os.system(cmd)
@@ -202,7 +203,6 @@
os.remove(temp_c)
os.remove(temp_def)
-
return lines
@@ -252,7 +252,8 @@
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
defines_final = [("#define %s %s" % item) for item in defines]
- defines_final += cmake_compiler_defines() # defines from the compiler
+ if sys.platform != "win32":
+ defines_final += cmake_compiler_defines() # defines from the
compiler
f.write("\n".join(defines_final))
print("Blender project file written to: %s" % qtc_prj)
Modified: trunk/blender/source/blender/editors/animation/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/animation/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/animation/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -28,6 +28,7 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/armature/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/armature/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -29,6 +29,7 @@
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/opennl/extern
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/gpencil/CMakeLists.txt 2011-04-06
01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/gpencil/CMakeLists.txt 2011-04-06
03:02:40 UTC (rev 36030)
@@ -29,6 +29,7 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/interface/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/interface/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/interface/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -32,6 +32,7 @@
../../python
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/mesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/mesh/CMakeLists.txt 2011-04-06
01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/mesh/CMakeLists.txt 2011-04-06
03:02:40 UTC (rev 36030)
@@ -30,6 +30,7 @@
../../windowmanager
../../render/extern/include
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/physics/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/physics/CMakeLists.txt 2011-04-06
01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/physics/CMakeLists.txt 2011-04-06
03:02:40 UTC (rev 36030)
@@ -29,6 +29,7 @@
../../windowmanager
../../../../intern/elbeem/extern
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/screen/CMakeLists.txt 2011-04-06
01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/screen/CMakeLists.txt 2011-04-06
03:02:40 UTC (rev 36030)
@@ -30,6 +30,7 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -31,6 +31,7 @@
../../windowmanager
../../render/extern/include
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_action/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_action/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_action/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -28,6 +28,7 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -28,6 +28,7 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_console/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_console/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_console/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -29,6 +29,7 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_file/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_file/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -31,6 +31,7 @@
../../windowmanager
../../render/extern/include
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -29,6 +29,7 @@
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/audaspace/intern
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_image/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -31,6 +31,7 @@
../../windowmanager
../../render/extern/include
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_info/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_info/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_info/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -30,6 +30,7 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -29,6 +29,7 @@
../../windowmanager
../../editors/interface
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -28,6 +28,7 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_node/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_node/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_node/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -33,6 +33,7 @@
../../render/extern/include
../../../../intern/guardedalloc
../../../../intern/opennl/extern
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
2011-04-06 01:51:43 UTC (rev 36029)
+++ trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
2011-04-06 03:02:40 UTC (rev 36030)
@@ -30,6 +30,7 @@
../../windowmanager
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
