diff options
-rw-r--r-- | SConstruct | 83 | ||||
-rw-r--r-- | intern/bmfont/SConscript | 1 | ||||
-rw-r--r-- | intern/ghost/SConscript | 1 | ||||
-rw-r--r-- | source/blender/python/SConscript | 1 | ||||
-rw-r--r-- | source/blender/radiosity/SConscript | 2 | ||||
-rw-r--r-- | source/blender/src/SConscript | 1 | ||||
-rw-r--r-- | source/creator/SConscript | 1 |
7 files changed, 89 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index e29f6423f06..305c8524235 100644 --- a/SConstruct +++ b/SConstruct @@ -503,8 +503,87 @@ elif string.find (sys.platform, 'hp-ux') != -1: window_system = 'X11' defines = [] +elif sys.platform=='openbsd3': + print "Building for OpenBSD 3.x" + use_international = 'false' + use_gameengine = 'false' + use_openal = 'false' + use_fmod = 'false' + use_quicktime = 'false' + use_sumo = 'false' + use_ode = 'false' + use_buildinfo = 'true' + build_blender_dynamic = 'true' + build_blender_static = 'false' + build_blender_player = 'false' + build_blender_plugin = 'false' + release_flags = ['-O2'] + debug_flags = ['-O2', '-g'] + extra_flags = ['-pipe', '-fPIC', '-funsigned-char'] + cxxflags = [] + defines = [] + warn_flags = ['-Wall','-W'] + window_system = 'X11' + platform_libs = ['m', 'stdc++', 'pthread', 'util'] + platform_libpath = [] + platform_linkflags = [] + extra_includes = [] + z_lib = ['z'] + z_libpath = ['/usr/lib'] + z_include = ['/usr/include'] + # png library information + png_lib = ['png'] + png_libpath = ['/usr/local/lib'] + png_include = ['/usr/local/include'] + # jpeg library information + jpeg_lib = ['jpeg'] + jpeg_libpath = ['/usr/local/lib'] + jpeg_include = ['/usr/local/include'] + # OpenGL library information + opengl_lib = ['GL', 'GLU'] + opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a'] + opengl_libpath = ['/usr/lib', '/usr/X11R6/lib'] + opengl_include = ['/usr/X11R6/include/'] + # SDL library information + sdl_env.ParseConfig ('sdl-config --cflags --libs') + sdl_cflags = sdl_env.Dictionary()['CCFLAGS'] + sdl_include = sdl_env.Dictionary()['CPPPATH'] + sdl_libpath = sdl_env.Dictionary()['LIBPATH'] + sdl_lib = sdl_env.Dictionary()['LIBS'] + # SOLID library information + solid_lib = [] # TODO + solid_libpath = [] # TODO + solid_include = ['#extern/solid/include'] + qhull_lib = [] # TODO + qhull_libpath = [] # TODO + qhull_include = ['#extern/qhull/include'] + # ODE library information + ode_lib = ['ode'] + ode_libpath = ['#../lib/linux-glibc2.2.5-i386/ode/lib'] + ode_include = ['#../lib/linux-glibc2.2.5-i386/ode/include'] + # Python library information + python_lib = ['python%d.%d' % sys.version_info[0:2]] + python_libpath = [sysconfig.get_python_lib (0, 1) + '/config'] + python_include = [sysconfig.get_python_inc ()] + # International support information + ftgl_lib = ['ftgl'] + ftgl_libpath = ['#../lib/linux-glibc2.2.5-i386/ftgl/lib'] + ftgl_include = ['#../lib/linux-glibc2.2.5-i386/ftgl/include'] + freetype_env.ParseConfig('pkg-config --cflags --libs freetype2') + freetype_lib = freetype_env.Dictionary()['LIBS'] + freetype_libpath = freetype_env.Dictionary()['LIBPATH'] + freetype_include = freetype_env.Dictionary()['CPPPATH'] + gettext_lib = [] + gettext_libpath = [] + gettext_include = [] + # OpenAL library information + openal_lib = ['openal'] + openal_libpath = ['/usr/lib'] + openal_include = ['/usr/include'] + else: - print "Unknown platform" + print "Unknown platform %s"%sys.platform + exit #----------------------------------------------------------------------------- # End of platform specific section @@ -862,6 +941,7 @@ if user_options_dict['BUILD_BLENDER_DYNAMIC'] == 1: dy_blender = link_env.Copy () dy_blender.Append (LIBS=user_options_dict['OPENGL_LIBRARY']) dy_blender.Append (LIBPATH=user_options_dict['OPENGL_LIBPATH']) + dy_blender.Append (CPPPATH=user_options_dict['OPENGL_INCLUDE']) if user_options_dict['USE_BUILDINFO'] == 1: dy_blender.Append (CPPDEFINES = ['BUILD_TIME=\'"%s"\''%(build_time), 'BUILD_DATE=\'"%s"\''%(build_date), @@ -888,6 +968,7 @@ if user_options_dict['BUILD_BLENDER_STATIC'] == 1: 'NAN_BUILDINFO', 'BUILD_PLATFORM=\'"%s"\''%(sys.platform)]) st_blender.Append (LINKFLAGS=user_options_dict['OPENGL_STATIC']) + st_blender.Append (CPPPATH=user_options_dict['OPENGL_INCLUDE']) s_obj = [st_blender.Object (root_build_dir+'source/creator/s_buildinfo', [root_build_dir+'source/creator/buildinfo.c'])] st_blender.Prepend (LIBPATH=['/usr/lib/opengl/xfree/lib']) diff --git a/intern/bmfont/SConscript b/intern/bmfont/SConscript index c5207760c5a..b0f596c57c9 100644 --- a/intern/bmfont/SConscript +++ b/intern/bmfont/SConscript @@ -18,4 +18,5 @@ source_files = ['intern/BMF_Api.cpp', bmfont_env.Append (CPPPATH = ['.', 'intern']) +bmfont_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) bmfont_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_BMF', source=source_files) diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 6b58f056d9c..b8d47f49f33 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -36,4 +36,5 @@ else: ghost_env.Append (CPPPATH = ['.', '../string']) +ghost_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) ghost_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_GHOST', source=source_files) diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 21cc9d558e9..0c55dd6ae97 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -56,5 +56,6 @@ python_env.Append (CPPPATH = ['api2_2x', '../include']) python_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) +python_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) python_env.Append (CPPPATH = extra_includes) python_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_python', source=source_files) diff --git a/source/blender/radiosity/SConscript b/source/blender/radiosity/SConscript index 2e7be6ae331..477c9521a45 100644 --- a/source/blender/radiosity/SConscript +++ b/source/blender/radiosity/SConscript @@ -19,4 +19,6 @@ rad_env.Append (CPPPATH = ['extern/include', '#/intern/guardedalloc', '../render/extern/include']) +rad_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) + rad_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_radiosity', source=source_files) diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index c5586204b77..06f89015df7 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -131,6 +131,7 @@ src_env.Append (CPPPATH = ['#/intern/guardedalloc', src_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) src_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE']) +src_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) if user_options_dict['USE_INTERNATIONAL'] == 1: src_env.Append (CPPPATH=['../ftfont']) diff --git a/source/creator/SConscript b/source/creator/SConscript index 749fb6b75e2..274f3a22618 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -17,6 +17,7 @@ creator_env.Append (CPPPATH = ['#/intern/guardedalloc', '../blender/makesdna', '../kernel/gen_messaging', '../kernel/gen_system']) +creator_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) if user_options_dict['USE_QUICKTIME'] == 1: creator_env.Append (CPPDEFINES = ['WITH_QUICKTIME']) |