From 5c7bed92d4a124a92c596f2dbe212cc59335925f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 6 Apr 2011 03:02:40 +0000 Subject: fix for cmake glew includes (tested with mingw), also made qtcreator project generator work with mingw again --- build_files/cmake/cmake_qtcreator_project.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py index 617f2c2a81f..85d37549917 100644 --- a/build_files/cmake/cmake_qtcreator_project.py +++ b/build_files/cmake/cmake_qtcreator_project.py @@ -114,10 +114,11 @@ def cmake_advanced_info(): """ 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 @@ def cmake_compiler_defines(): os.remove(temp_c) os.remove(temp_def) - return lines @@ -252,7 +252,8 @@ def create_qtc_project_main(): 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) -- cgit v1.2.3