From: <tz...@us...> - 2006-02-01 01:38:49
|
Revision: 1716 Author: tzlaine Date: 2006-01-31 17:38:34 -0800 (Tue, 31 Jan 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1716&view=rev Log Message: ----------- Removed the include paths GG/net, GG/SDL, and GG/dialogs from the build command, since they are no longer needed with the new GG header naming scheme. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2006-02-01 01:33:59 UTC (rev 1715) +++ trunk/FreeOrion/SConstruct 2006-02-01 01:38:34 UTC (rev 1716) @@ -355,16 +355,6 @@ # GG AppendPackagePaths('gg', env) - try: - env.Append(CPPPATH = [ - os.path.normpath(os.path.join(env['with_gg_include'], 'net')), - os.path.normpath(os.path.join(env['with_gg_include'], 'SDL')), - os.path.normpath(os.path.join(env['with_gg_include'], 'dialogs')) - ]) - except KeyError: - # no with_gg_include set - pass - # zlib if str(Platform()) == 'win32': |
From: <tz...@us...> - 2006-02-07 03:30:50
|
Revision: 1735 Author: tzlaine Date: 2006-02-06 19:30:37 -0800 (Mon, 06 Feb 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1735&view=rev Log Message: ----------- Added flags to the command line to eliminate more irritating MSVC warnings. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2006-02-06 18:13:43 UTC (rev 1734) +++ trunk/FreeOrion/SConstruct 2006-02-07 03:30:37 UTC (rev 1735) @@ -415,7 +415,7 @@ '/GR', '/Gd', '/Zi', - '/wd4099', '/wd4251', '/wd4800', '/wd4267', '/wd4275', '/wd4244', '/wd4101', '/wd4258' + '/wd4099', '/wd4251', '/wd4800', '/wd4267', '/wd4275', '/wd4244', '/wd4101', '/wd4258', '/wd4351', '/wd4996' ] env.Append(CCFLAGS = flags) env.Append(CPPDEFINES = [ |
From: <de...@us...> - 2006-02-23 19:25:50
|
Revision: 1770 Author: dennis Date: 2006-02-23 11:25:41 -0800 (Thu, 23 Feb 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1770&view=rev Log Message: ----------- Added check for boost.iostreams Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2006-02-23 00:32:43 UTC (rev 1769) +++ trunk/FreeOrion/SConstruct 2006-02-23 19:25:41 UTC (rev 1770) @@ -190,7 +190,10 @@ env.ParseConfig('pkg-config --cflags --libs GiGiSDL') found_gg_pkg_config = True - freeorion_boost_libs = [('boost_serialization', 'boost/archive/binary_iarchive.hpp', 'boost::archive::binary_iarchive::is_saving();')] + freeorion_boost_libs = [ + ('boost_serialization', 'boost/archive/binary_iarchive.hpp', 'boost::archive::binary_iarchive::is_saving();'), + ('boost_iostreams', 'boost/iostreams/filtering_stream.hpp', '') + ] if found_gg_pkg_config: if not conf.CheckBoost(boost_version_string, freeorion_boost_libs, conf, not ms_linker): @@ -327,6 +330,8 @@ if pkg_config: if conf.CheckPkg('graphviz', graphviz_pkgconfig_version): env.ParseConfig('pkg-config --cflags --libs graphviz') + elif conf.CheckPkg('libdotneato', graphviz_pkgconfig_version): + env.ParseConfig('pkg-config --cflags --libs libdotneato') if not conf.CheckCHeader('graphviz/render.h') and not conf.CheckCHeader('render.h'): Exit(1) env.Append(LIBS = [ |
From: <de...@us...> - 2006-02-24 02:45:18
|
Revision: 1773 Author: dennis Date: 2006-02-23 18:45:09 -0800 (Thu, 23 Feb 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1773&view=rev Log Message: ----------- Let SCons only create one .sconsign file Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2006-02-23 23:39:15 UTC (rev 1772) +++ trunk/FreeOrion/SConstruct 2006-02-24 02:45:09 UTC (rev 1773) @@ -7,6 +7,8 @@ from build_support import * env = Environment() +# Do not put a .sconsign file into every directory +env.SConsignFile() mising_pkg_config = not WhereIs('pkg-config') |
From: <tz...@us...> - 2006-05-22 06:25:44
|
Revision: 1829 Author: tzlaine Date: 2006-05-21 23:25:39 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1829&view=rev Log Message: ----------- Updated the Win32 build to use the newest version of GraphViz. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2006-05-21 08:30:27 UTC (rev 1828) +++ trunk/FreeOrion/SConstruct 2006-05-22 06:25:39 UTC (rev 1829) @@ -337,14 +337,31 @@ if not found_it_with_pkg_config: if not conf.CheckCHeader('gvc.h'): Exit(1) - if str(Platform()) != 'win32': + if str(Platform()) == 'win32': + env.AppendUnique(LIBS = [ + 'cdt', + 'circogen', + 'common', + 'dotgen', + 'fdpgen', + 'gd', + 'graph', + 'gvc', + 'libexpat', + 'neatogen', + 'pack', + 'pathplan', + 'plugin', + 'twopigen' + ]) + else: if not conf.CheckLib('gvc', 'gvContext', header = '#include <gvc.h>'): Exit(1) - env.AppendUnique(LIBS = [ - 'cdt', - 'graph', - 'gvc' - ]) + env.AppendUnique(LIBS = [ + 'cdt', + 'graph', + 'gvc' + ]) # Log4cpp AppendPackagePaths('log4cpp', env) @@ -441,7 +458,6 @@ env.AppendUnique(LINKFLAGS = ['/SUBSYSTEM:CONSOLE', '/DEBUG']) env.AppendUnique(LIBS = [ 'comdlg32', - 'gd', 'gdi32', 'GiGi', 'GiGiNet', @@ -449,7 +465,6 @@ 'glu32', 'jpeg', 'kernel32', - 'libexpat', 'log4cpp', 'opengl32', 'png', |
From: <tz...@us...> - 2007-06-28 01:13:18
|
Revision: 2099 http://svn.sourceforge.net/freeorion/revision/?rev=2099&view=rev Author: tzlaine Date: 2007-06-27 18:13:17 -0700 (Wed, 27 Jun 2007) Log Message: ----------- Changed all the ALUT detection code to check for FreeALUT as well, since it is called one on some systems, and the other on other systems. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2007-06-26 07:56:19 UTC (rev 2098) +++ trunk/FreeOrion/SConstruct 2007-06-28 01:13:17 UTC (rev 2099) @@ -56,9 +56,9 @@ options.Add('with_openal', 'Root directory of OpenAL installation') options.Add('with_openal_include', 'Specify exact include dir for OpenAL headers') options.Add('with_openal_libdir', 'Specify exact library dir for OpenAL library') -options.Add('with_alut', 'Root directory of ALUT installation') -options.Add('with_alut_include', 'Specify exact include dir for ALUT headers') -options.Add('with_alut_libdir', 'Specify exact library dir for ALUT library') +options.Add('with_alut', 'Root directory of ALUT/FreeALUT installation') +options.Add('with_alut_include', 'Specify exact include dir for ALUT/FreeALUT headers') +options.Add('with_alut_libdir', 'Specify exact library dir for ALUT/FreeALUT library') options.Add('with_vorbis', 'Root directory of Vorbis installation') options.Add('with_vorbis_include', 'Specify exact include dir for Vorbis headers') options.Add('with_vorbis_libdir', 'Specify exact library dir for Vorbis library') @@ -316,7 +316,7 @@ found_it_with_pkg_config = False - # OpenAL & ALUT + # OpenAL & ALUT/FreeALUT AppendPackagePaths('openal', env) found_it_with_pkg_config = False if pkg_config: @@ -334,16 +334,20 @@ AppendPackagePaths('alut', env) found_it_with_pkg_config = False if pkg_config: - if conf.CheckPkg('alut', alut_pkgconfig_version): + if conf.CheckPkg('freealut', alut_pkgconfig_version): env.ParseConfig('pkg-config --cflags --libs freealut') found_it_with_pkg_config = True + elif conf.CheckPkg('alut', alut_pkgconfig_version): + env.ParseConfig('pkg-config --cflags --libs alut') + found_it_with_pkg_config = True if not found_it_with_pkg_config: if str(Platform()) == 'win32': env.AppendUnique(LIBS = [ 'ALut.lib' ]) else: - if not conf.CheckLibWithHeader('alut', 'AL/alut.h', 'C', 'alutInitWithoutContext(0,0);'): + if not conf.CheckLibWithHeader('freealut', 'AL/alut.h', 'C', 'alutInitWithoutContext(0,0);') \ + and not conf.CheckLibWithHeader('alut', 'AL/alut.h', 'C', 'alutInitWithoutContext(0,0);'): Exit(1) # Vorbis @@ -425,6 +429,26 @@ if str(Platform()) == 'win32': AppendPackagePaths('zlib', env) + # Python + import distutils.sysconfig + env.AppendUnique(LINKFLAGS = [ + Split(distutils.sysconfig.get_config_var('LINKFORSHARED')) + ]) + print Split(distutils.sysconfig.get_config_var('LINKFORSHARED')) + if not (env.has_key('with_python_include') and env.has_key('with_python_libdir') and env.has_key('python_suffix')): + python_include = distutils.sysconfig.get_python_inc() + python_libdir = distutils.sysconfig.get_config_var('LIBDIR') + python_suffix = distutils.sysconfig.get_config_var('VERSION') + else: + python_include = env['with_python_include'] + python_libdir = env['with_python_libdir'] + python_suffix = env['python_suffix'] + + #env.AppendUnique(CPPPATH = [python_include]) + #env.AppendUnique(LIBPATH = [python_libdir]) + if not conf.CheckLibWithHeader('python' + python_suffix, 'Python.h', 'C', 'Py_Initialize();'): + Exit(1) + # finish config and save results for later conf.CheckConfigSuccess(True) conf.Finish(); |
From: <tz...@us...> - 2007-07-21 00:45:32
|
Revision: 2185 http://svn.sourceforge.net/freeorion/revision/?rev=2185&view=rev Author: tzlaine Date: 2007-07-20 17:45:35 -0700 (Fri, 20 Jul 2007) Log Message: ----------- Repaired the badly-broken install SCons build target. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2007-07-20 23:33:43 UTC (rev 2184) +++ trunk/FreeOrion/SConstruct 2007-07-21 00:45:35 UTC (rev 2185) @@ -29,8 +29,10 @@ options.Add('prefix', 'Location to install FreeOrion', '/usr/local') else: options.Add('prefix', 'Location to install FreeOrion', 'C:\\') +options.Update(env) options.Add('scons_cache_dir', 'Directory to use for SCons object file caching (specifying any directory will enable caching)') -options.Add('bindir', 'Location to install executables', os.path.normpath(os.path.join('$prefix', 'bin'))) +options.Add('bindir', 'Location to install executables', os.path.normpath(os.path.join(env['prefix'], 'bin'))) +options.Add('datadir', 'Location to install application data', os.path.normpath(os.path.join(env['prefix'], 'share/freeorion'))) options.Add('with_boost', 'Root directory of boost installation') options.Add('with_boost_include', 'Specify exact include dir for boost headers') options.Add('with_boost_libdir', 'Specify exact library dir for boost library') @@ -604,6 +606,7 @@ Alias('install', Install(env['bindir'], freeoriond)) Alias('install', Install(env['bindir'], freeorionca)) Alias('install', Install(env['bindir'], freeorion)) +Alias('install', Install(env['datadir'], ['default', 'DejaVuSans-BoldOblique.ttf', 'DejaVuSans-Bold.ttf', 'DejaVuSans-Oblique.ttf', 'DejaVuSans.ttf'])) # uninstall target # This is a dirty hack, used here because I don't know how else to do this. Basically, I've created a Command that @@ -613,7 +616,8 @@ deletions = [ Delete(os.path.normpath(os.path.join(env['bindir'], str(freeoriond[0])))), Delete(os.path.normpath(os.path.join(env['bindir'], str(freeorionca[0])))), - Delete(os.path.normpath(os.path.join(env['bindir'], str(freeorion[0])))) + Delete(os.path.normpath(os.path.join(env['bindir'], str(freeorion[0])))), + Delete(os.path.normpath(env['datadir'])) ] uninstall_cmd = env.Command('.unlikely_filename934765437', 'SConstruct', deletions) Alias('uninstall', uninstall_cmd) |
From: <geo...@us...> - 2008-02-03 17:37:17
|
Revision: 2302 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2302&view=rev Author: geoffthemedio Date: 2008-02-03 09:37:06 -0800 (Sun, 03 Feb 2008) Log Message: ----------- Small change to SConstruct suggested in forums which fixes a configuration problem that occurs if GG is not found with pkg-config Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2008-02-03 02:51:55 UTC (rev 2301) +++ trunk/FreeOrion/SConstruct 2008-02-03 17:37:06 UTC (rev 2302) @@ -254,8 +254,8 @@ if str(Platform()) == 'posix': if env['multithreaded']: if conf.CheckCHeader('pthread.h') and conf.CheckLib('pthread', 'pthread_create', autoadd = 0): - env.AppendUnique(CCFLAGS = ' -pthread') - env.AppendUnique(LINKFLAGS = ' -pthread') + env.AppendUnique(CCFLAGS = '-pthread') + env.AppendUnique(LINKFLAGS = '-pthread') else: Exit(1) |
From: <tz...@us...> - 2007-06-28 01:15:52
|
Revision: 2100 http://svn.sourceforge.net/freeorion/revision/?rev=2100&view=rev Author: tzlaine Date: 2007-06-27 18:15:55 -0700 (Wed, 27 Jun 2007) Log Message: ----------- Removed in-progress code that was accidentally committed in the previous comit of SConstruct. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2007-06-28 01:13:17 UTC (rev 2099) +++ trunk/FreeOrion/SConstruct 2007-06-28 01:15:55 UTC (rev 2100) @@ -429,26 +429,6 @@ if str(Platform()) == 'win32': AppendPackagePaths('zlib', env) - # Python - import distutils.sysconfig - env.AppendUnique(LINKFLAGS = [ - Split(distutils.sysconfig.get_config_var('LINKFORSHARED')) - ]) - print Split(distutils.sysconfig.get_config_var('LINKFORSHARED')) - if not (env.has_key('with_python_include') and env.has_key('with_python_libdir') and env.has_key('python_suffix')): - python_include = distutils.sysconfig.get_python_inc() - python_libdir = distutils.sysconfig.get_config_var('LIBDIR') - python_suffix = distutils.sysconfig.get_config_var('VERSION') - else: - python_include = env['with_python_include'] - python_libdir = env['with_python_libdir'] - python_suffix = env['python_suffix'] - - #env.AppendUnique(CPPPATH = [python_include]) - #env.AppendUnique(LIBPATH = [python_libdir]) - if not conf.CheckLibWithHeader('python' + python_suffix, 'Python.h', 'C', 'Py_Initialize();'): - Exit(1) - # finish config and save results for later conf.CheckConfigSuccess(True) conf.Finish(); |
From: <tz...@us...> - 2007-07-21 18:53:04
|
Revision: 2193 http://svn.sourceforge.net/freeorion/revision/?rev=2193&view=rev Author: tzlaine Date: 2007-07-21 11:53:06 -0700 (Sat, 21 Jul 2007) Log Message: ----------- Fixed the "dirty hack" uninstall target based on a technique posted on the FreeOrion forums. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2007-07-21 17:31:19 UTC (rev 2192) +++ trunk/FreeOrion/SConstruct 2007-07-21 18:53:06 UTC (rev 2193) @@ -608,19 +608,15 @@ Alias('install', Install(env['bindir'], freeorion)) Alias('install', Install(env['datadir'], ['default', 'DejaVuSans-BoldOblique.ttf', 'DejaVuSans-Bold.ttf', 'DejaVuSans-Oblique.ttf', 'DejaVuSans.ttf'])) -# uninstall target -# This is a dirty hack, used here because I don't know how else to do this. Basically, I've created a Command that -# deletes the uninstallable files. To keep it dependent on its target and source arguments, I made it depend on -# SConstruct for its source, since it is guaranteed to exist, and a target with a filename which is pretty well -# guaranteed not to exist, and which is in fact never created. deletions = [ Delete(os.path.normpath(os.path.join(env['bindir'], str(freeoriond[0])))), Delete(os.path.normpath(os.path.join(env['bindir'], str(freeorionca[0])))), Delete(os.path.normpath(os.path.join(env['bindir'], str(freeorion[0])))), Delete(os.path.normpath(env['datadir'])) ] -uninstall_cmd = env.Command('.unlikely_filename934765437', 'SConstruct', deletions) -Alias('uninstall', uninstall_cmd) +uninstall = env.Command('uninstall', '', deletions) +env.AlwaysBuild(uninstall) +env.Precious(uninstall) # default targets Default(freeoriond, freeorionca, freeorion) |
From: <geo...@us...> - 2008-02-07 23:25:39
|
Revision: 2308 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2308&view=rev Author: geoffthemedio Date: 2008-02-07 15:25:41 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Fixed by loonycyborg for SConstruct related to recent move of font files. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2008-02-06 22:08:41 UTC (rev 2307) +++ trunk/FreeOrion/SConstruct 2008-02-07 23:25:41 UTC (rev 2308) @@ -595,7 +595,7 @@ Alias('install', Install(env['bindir'], freeoriond)) Alias('install', Install(env['bindir'], freeorionca)) Alias('install', Install(env['bindir'], freeorion)) -Alias('install', Install(env['datadir'], ['default', 'DejaVuSans-BoldOblique.ttf', 'DejaVuSans-Bold.ttf', 'DejaVuSans-Oblique.ttf', 'DejaVuSans.ttf'])) +Alias('install', Install(env['datadir'], 'default')) deletions = [ Delete(os.path.normpath(os.path.join(env['bindir'], str(freeoriond[0])))), |
From: <tz...@us...> - 2008-04-12 00:49:36
|
Revision: 2478 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2478&view=rev Author: tzlaine Date: 2008-04-11 17:49:37 -0700 (Fri, 11 Apr 2008) Log Message: ----------- Added '/O2 /D_MBCS' to command line of Windows SCons build. Inexplicably, this is necessary. Without it, FO crashes just after startup. I hate Microsoft. Modified Paths: -------------- trunk/FreeOrion/SConstruct Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2008-04-11 06:59:17 UTC (rev 2477) +++ trunk/FreeOrion/SConstruct 2008-04-12 00:49:37 UTC (rev 2478) @@ -500,6 +500,7 @@ flags = [ #env['debug'] and '/Od' or '/Ox', code_generation_flag, + '/O2', '/EHsc', '/W3', '/Zc:forScope', @@ -512,7 +513,8 @@ env.AppendUnique(CPPDEFINES = [ (env['debug'] and '_DEBUG' or 'NDEBUG'), 'WIN32', - '_WINDOWS' + '_WINDOWS', + '_MBCS' ]) if env['dynamic']: env.AppendUnique(CPPDEFINES = [ |