fix for cmake glew includes (tested with mingw), also made qtcreator project generator work with mingw again

This commit is contained in:
Campbell Barton 2011-04-06 03:02:40 +00:00
parent 1c8d311287
commit 5c7bed92d4
28 changed files with 32 additions and 4 deletions

@ -114,10 +114,11 @@ def cmake_advanced_info():
""" """
def create_eclipse_project(CMAKE_DIR): def create_eclipse_project(CMAKE_DIR):
print("CMAKE_DIR %r" % CMAKE_DIR)
if sys.platform == "win32": 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: else:
cmd = 'cmake %r -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
os.system(cmd) os.system(cmd)
@ -202,7 +203,6 @@ def cmake_compiler_defines():
os.remove(temp_c) os.remove(temp_c)
os.remove(temp_def) os.remove(temp_def)
return lines return lines
@ -252,7 +252,8 @@ def create_qtc_project_main():
f = open(qtc_cfg, 'w') f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n") f.write("// ADD PREDEFINED MACROS HERE!\n")
defines_final = [("#define %s %s" % item) for item in defines] 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)) f.write("\n".join(defines_final))
print("Blender project file written to: %s" % qtc_prj) print("Blender project file written to: %s" % qtc_prj)

@ -28,6 +28,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -29,6 +29,7 @@ set(INC
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
../../../../intern/opennl/extern ../../../../intern/opennl/extern
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -29,6 +29,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -32,6 +32,7 @@ set(INC
../../python ../../python
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -30,6 +30,7 @@ set(INC
../../windowmanager ../../windowmanager
../../render/extern/include ../../render/extern/include
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -29,6 +29,7 @@ set(INC
../../windowmanager ../../windowmanager
../../../../intern/elbeem/extern ../../../../intern/elbeem/extern
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -30,6 +30,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -31,6 +31,7 @@ set(INC
../../windowmanager ../../windowmanager
../../render/extern/include ../../render/extern/include
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -28,6 +28,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -28,6 +28,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -29,6 +29,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -31,6 +31,7 @@ set(INC
../../windowmanager ../../windowmanager
../../render/extern/include ../../render/extern/include
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -29,6 +29,7 @@ set(INC
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
../../../../intern/audaspace/intern ../../../../intern/audaspace/intern
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -31,6 +31,7 @@ set(INC
../../windowmanager ../../windowmanager
../../render/extern/include ../../render/extern/include
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -30,6 +30,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -29,6 +29,7 @@ set(INC
../../windowmanager ../../windowmanager
../../editors/interface ../../editors/interface
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -28,6 +28,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -33,6 +33,7 @@ set(INC
../../render/extern/include ../../render/extern/include
../../../../intern/guardedalloc ../../../../intern/guardedalloc
../../../../intern/opennl/extern ../../../../intern/opennl/extern
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -30,6 +30,7 @@ set(INC
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
../../../../intern/opennl/extern ../../../../intern/opennl/extern
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -28,6 +28,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -30,6 +30,7 @@ set(INC
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
../../../../intern/audaspace/intern ../../../../intern/audaspace/intern
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -28,6 +28,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -29,6 +29,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -28,6 +28,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -33,6 +33,7 @@ set(INC
../../render/extern/include ../../render/extern/include
../../../../intern/guardedalloc ../../../../intern/guardedalloc
../../../../intern/smoke/extern ../../../../intern/smoke/extern
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -28,6 +28,7 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

@ -29,6 +29,7 @@ set(INC
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
../../../../intern/opennl/extern ../../../../intern/opennl/extern
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC