From 168eb2a8f84782019720de52ca7f90e44c7d266b Mon Sep 17 00:00:00 2001 From: Ben Anderson Date: Tue, 31 Jan 2006 00:52:42 +0000 Subject: [PATCH] Remove ScreenTest; set up compiling libresample using SCons --- stepmania/src/SConscript | 4 ++-- stepmania/src/libresample/SConscript | 2 ++ stepmania/src/libresample/src/resample_defs.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 stepmania/src/libresample/SConscript diff --git a/stepmania/src/SConscript b/stepmania/src/SConscript index e02d8adca0..62638354e0 100644 --- a/stepmania/src/SConscript +++ b/stepmania/src/SConscript @@ -178,7 +178,6 @@ Screens = [ "ScreenSongOptions.cpp", "ScreenSplash.cpp", "ScreenStage.cpp", - "ScreenTest.cpp", "ScreenTestFonts.cpp", "ScreenTestInput.cpp", "ScreenTestLights.cpp", @@ -634,7 +633,8 @@ cryptopp = [ env = conf.Finish() -env.Command("libresample/libresample.a", "", "cd src/libresample && ./configure && make") +env.Append(CPPFLAGS='-g2') +SConscript('libresample/SConscript') env.Program('stepmania', Screens + DataStructures + FileTypes + StepMania + Arch +\ ActorsInGameplayAndMenus + ActorsInMenus + ActorsInGameplay + Rage +\ diff --git a/stepmania/src/libresample/SConscript b/stepmania/src/libresample/SConscript new file mode 100644 index 0000000000..ccf4341500 --- /dev/null +++ b/stepmania/src/libresample/SConscript @@ -0,0 +1,2 @@ +# This is not binary, damnit! Stupid Eclipse. +Library('resample', ['src/hackedresamplesubs.c', 'src/filterkit.c', 'src/resample.c', 'src/resamplesubs.c'], CPPFLAGS="-DNO_AUTOCONF") diff --git a/stepmania/src/libresample/src/resample_defs.h b/stepmania/src/libresample/src/resample_defs.h index 576c1bc2e2..d1b642b3d0 100644 --- a/stepmania/src/libresample/src/resample_defs.h +++ b/stepmania/src/libresample/src/resample_defs.h @@ -14,7 +14,7 @@ #ifndef __RESAMPLE_DEFS__ #define __RESAMPLE_DEFS__ -#if !defined(WIN32) && !defined(__CYGWIN__) +#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(NO_AUTOCONF) #include "config.h" #endif