actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

clean weird tabbing, remove old SDL stuff

Browse Source
This commit is contained in:
Glenn Maynard
2004-04-06 01:30:02 +00:00
parent 44bb7da19f
commit 47bb04c42c
1 changed files with 46 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Makefile.am
+11 -47
View File
@@ -15,26 +15,6 @@ AM_CXXFLAGS += -finline-limit=300
AM_CXXFLAGS += $(X_CFLAGS)
if NHAVE_SDL
# We use our own copy of SDL if the one on the system isn't new enough. (Most
# systems have 1.2.5; we need 1.2.6.) We still end up linking dynamically to
# the shared system library through SDL_image, but that shouldn't cause problems.
SDL-1.2.6/Makefile:
test -d SDL-1.2.6 || mkdir SDL-1.2.6
cd SDL-1.2.6 && sh ../$(srcdir)/SDL-1.2.6/configure
--disable-nasm --disable-arts --disable-esd --enable-static --disable-shared \
--disable-debug --disable-alsa --disable-oss --disable-video-directfb
SDL-1.2.6/src/.libs/libSDL.a: SDL-1.2.6/Makefile
make -C SDL-1.2.6
USE_SDL_LIBS = SDL-1.2.6/src/.libs/libSDL.a
AM_CXXFLAGS += -ISDL-1.2.6/include
else
USE_SDL_LIBS = $(SDL_LIBS)
endif
$(srcdir)/libresample/libresample.a:
cd $(srcdir)/libresample && autoconf && sh ./configure && make
@@ -106,8 +86,7 @@ Sound += arch/Sound/RageSoundDriver_OSS.cpp arch/Sound/RageSoundDriver_OSS.h
endif
if HAVE_ALSA
Sound += arch/Sound/ALSA9Dynamic.cpp arch/Sound/ALSA9Dynamic.h \
ALSA9Functions.h \
Sound += arch/Sound/ALSA9Dynamic.cpp arch/Sound/ALSA9Dynamic.h arch/Sound/ALSA9Functions.h \
arch/Sound/ALSA9Helpers.cpp arch/Sound/ALSA9Helpers.h \
arch/Sound/RageSoundDriver_ALSA9.cpp arch/Sound/RageSoundDriver_ALSA9.h \
arch/Sound/RageSoundDriver_ALSA9_Software.cpp arch/Sound/RageSoundDriver_ALSA9_Software.h
@@ -151,30 +130,20 @@ ArchUtils += archutils/Unix/Backtrace.cpp archutils/Unix/Backtrace.h \
archutils/Unix/LinuxThreadHelpers.cpp archutils/Unix/LinuxThreadHelpers.h
endif
Arch = $(LoadingWindow) \
$(Sound) \
$(ArchHooks) \
$(InputHandler) \
$(MovieTexture) \
$(Lights) \
$(MemoryCard) \
$(LowLevelWindow) \
$(ArchUtils) \
arch/arch.cpp arch/arch.h \
arch/arch_default.h \
arch/arch_linux.h \
arch/arch_platform.h
Arch = $(LoadingWindow) $(Sound) $(ArchHooks) $(InputHandler) $(MovieTexture) \
$(Lights) $(MemoryCard) $(LowLevelWindow) $(ArchUtils) \
arch/arch.cpp arch/arch.h arch/arch_default.h arch/arch_linux.h arch/arch_platform.h
RageSoundFileReaders = RageSoundReader_WAV.cpp RageSoundReader_WAV.h
if HAVE_MP3
RageSoundFileReaders += RageSoundReader_MP3.cpp RageSoundReader_MP3.h
endif
if HAVE_VORBIS
RageSoundFileReaders += RageSoundReader_Vorbisfile.cpp RageSoundReader_Vorbisfile.h
endif
if HAVE_MP3
RageSoundFileReaders += RageSoundReader_MP3.cpp RageSoundReader_MP3.h
endif
ActorsInGameplayAndMenus = \
BGAnimation.cpp BGAnimation.h BGAnimationLayer.cpp BGAnimationLayer.h Banner.cpp Banner.h \
ConditionalBGA.cpp ConditionalBGA.h DifficultyIcon.cpp DifficultyIcon.h MeterDisplay.cpp MeterDisplay.h \
@@ -214,12 +183,7 @@ Helpers = SDL_SaveJPEG.cpp SDL_SaveJPEG.h \
SDL_rotozoom.cpp SDL_rotozoom.h \
SDL_utils.cpp SDL_utils.h
PCRE = pcre/chartables.c \
pcre/get.c \
pcre/internal.h \
pcre/maketables.c \
pcre/pcre.c pcre/pcre.h \
pcre/study.c
PCRE = pcre/chartables.c pcre/get.c pcre/internal.h pcre/maketables.c pcre/pcre.c pcre/pcre.h pcre/study.c
RageFile = \
RageFile.cpp RageFile.h RageFileDriver.cpp RageFileDriver.h RageFileManager.cpp RageFileManager.h \
@@ -276,7 +240,7 @@ main_SOURCES = $(Screens) \
main_LDADD = \
$(AUDIO_LIBS) \
$(LUA_LIBS) \
$(USE_SDL_LIBS) \
$(SDL_LIBS) \
$(XLIBS) \
-lSDL_image \
$(srcdir)/libresample/libresample.a
@@ -328,7 +292,7 @@ test_audio_readers_SOURCES = \
test_audio_readers_LDADD = \
$(AUDIO_LIBS) \
$(USE_SDL_LIBS) \
$(SDL_LIBS) \
$(srcdir)/libresample/libresample.a
test_file_readers_SOURCES = \