Mercurial > hg > aimc
changeset 298:35a8fbf4ff82
-Added a bit of junk to try and build a bianry for OS X 10.4 in SConstruct
-Fixes to the FileList to build on linux - hopefully
| author | tomwalters |
|---|---|
| date | Tue, 23 Feb 2010 21:51:11 +0000 |
| parents | 09f6050303f8 |
| children | 57e6c567461c |
| files | trunk/SConstruct trunk/doc/ModuleTemplate.h trunk/src/Modules/Strobes/ModuleParabola.cc trunk/src/Modules/Strobes/ModuleParabola.h trunk/src/Support/FileList.cc |
| diffstat | 5 files changed, 18 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/trunk/SConstruct Tue Feb 23 13:09:33 2010 +0000 +++ b/trunk/SConstruct Tue Feb 23 21:51:11 2010 +0000 @@ -73,7 +73,7 @@ # Build products location and executable name build_dir = os.path.join('build', target_platform + '-release') -target_executable = 'aimc' +target_executable = 'AIMCopy' test_executable = 'aimc_tests' # Create build products directory if necessary @@ -117,10 +117,18 @@ else: print('Unsupported compiler: ' + compiler) Exit(1) - -if build_platform == 'darwin': - env.AppendUnique(CPPFLAGS = ['-arch', 'i386']) - env.AppendUnique(LINKFLAGS = ['-arch', 'i386']) + +# To make a statically-linked version for os 10.4 and up... +#if build_platform == 'darwin': +# env.AppendUnique(CPPFLAGS = ['-arch', 'i386']) +# env.AppendUnique(LINKFLAGS = ['-arch', 'i386']) +# env.AppendUnique(LINKFLAGS = ['-Wl']) +# env.AppendUnique(LINKFLAGS = ['-search_paths_first']) +# env.AppendUnique(MACOSX_DEPLOYMENT_TARGET = ['10.4']) +# env.AppendUnique(GCC_VERSION = ['4.0']) +# env.Replace(CC = ['gcc-4.0']) +# env.Replace(CXX = ['gcc-4.0']) +# env.AppendUnique(CPPFLAGS = ['-fno-stack-protector','-isysroot', '/Developer/SDKs/MacOSX10.5.sdk', '-mmacosx-version-min=10.4']) if not target_platform == 'win32': # On windows, utf support is builtin for SimpleIni @@ -134,7 +142,7 @@ env.Append(CPPPATH = ['#src']) # Dependencies -deplibs = ['sndfile'] +deplibs = ['sndfile', 'flac', 'vorbis', 'vorbisenc', 'ogg'] for depname in deplibs: env.ParseConfig('pkg-config --cflags --libs ' + depname) @@ -151,12 +159,12 @@ #test_env = env.Clone() #test_libs = ['gtest', 'gtest_main'] -#for depname in test_libs: -# test_env.ParseConfig('pkg-config --cflags --libs ' + depname) +##for depname in test_libs: +## test_env.ParseConfig('pkg-config --cflags --libs ' + depname) #test_env.AppendUnique(LIBPATH = ['/usr/local/lib'], # CPPPATH = ['/usr/local/lib'], # LIBS = test_libs) - +# #test = test_env.Program(target = os.path.join(build_dir, test_executable), # source = map(lambda x: '#' + build_dir + '/src/' + x, # test_sources))
--- a/trunk/doc/ModuleTemplate.h Tue Feb 23 13:09:33 2010 +0000 +++ b/trunk/doc/ModuleTemplate.h Tue Feb 23 21:51:11 2010 +0000 @@ -28,7 +28,6 @@ #include "Support/Module.h" namespace aimc { -using std::vector; class #MODULE_NAME# : public Module { public: explicit #MODULE_NAME#(Parameters *pParam);
--- a/trunk/src/Modules/Strobes/ModuleParabola.cc Tue Feb 23 13:09:33 2010 +0000 +++ b/trunk/src/Modules/Strobes/ModuleParabola.cc Tue Feb 23 21:51:11 2010 +0000 @@ -43,7 +43,6 @@ parabw_ = parameters_->DefaultFloat("parabola.width_cycles", 1.5f); strobe_decay_time_ = parameters_->DefaultFloat("parabla.strobe_decay_time", 0.02f); - max_strobes_ = parameters_->DefaultInt("parabola.max_strobes", 50); channel_count_ = 0; }