From 5669daa0abe98aab50a80c47a549d25d33bd77e7 Mon Sep 17 00:00:00 2001 From: soules Date: Fri, 28 Jul 2006 15:53:24 +0000 Subject: [PATCH] - removing the '.h' files from the link-path... dependecies should be captured from file parsing --- SConscript | 2 +- boards/SConscript | 2 -- drivers/common/SConscript | 9 --------- drivers/pc/SConscript | 10 ---------- fir/SConscript | 6 ------ input/SConscript | 3 --- mappers/SConscript | 4 ---- palettes/SConscript | 5 ----- 8 files changed, 1 insertion(+), 40 deletions(-) diff --git a/SConscript b/SConscript index 191df86c..cf883845 100644 --- a/SConscript +++ b/SConscript @@ -60,7 +60,7 @@ sdl_cflags.close(); sdl_libflags = os.popen("sdl-config --libs"); LINKFLAGS = sdl_libflags.read(); -LINKFLAGS = LINKFLAGS.rstrip(os.linesep); +LINKFLAGS = " -lz " + LINKFLAGS.rstrip(os.linesep); sdl_libflags.close(); env.Program('fceu', file_list, CCFLAGS=CCFLAGS, LIBPATH=LINKFLAGS) diff --git a/boards/SConscript b/boards/SConscript index 256cb105..2ed3a913 100644 --- a/boards/SConscript +++ b/boards/SConscript @@ -53,8 +53,6 @@ super24.cpp supervision.cpp t-262.cpp tengen.cpp -mapinc.h -mmc3.h """) for x in range(len(my_list)): my_list[x] = 'boards/' + my_list[x] diff --git a/drivers/common/SConscript b/drivers/common/SConscript index 1d983189..1fe1a4e7 100644 --- a/drivers/common/SConscript +++ b/drivers/common/SConscript @@ -1,23 +1,14 @@ Import('file_list') my_list = Split(""" args.cpp -args.h cheat.cpp -cheat.h config.cpp -config.h hq2x.cpp -hq2x.h hq3x.cpp -hq3x.h scale2x.cpp -scale2x.h scale3x.cpp -scale3x.h scalebit.cpp -scalebit.h vidblit.cpp -vidblit.h """) for x in range(len(my_list)): my_list[x] = 'drivers/common/' + my_list[x] diff --git a/drivers/pc/SConscript b/drivers/pc/SConscript index 6bec97de..e669f345 100644 --- a/drivers/pc/SConscript +++ b/drivers/pc/SConscript @@ -1,23 +1,13 @@ Import('file_list') my_list = Split(""" -dface.h input.cpp -input.h -keyscan.h main.cpp -main.h sdl.cpp -sdl.h -sdl-icon.h sdl-joystick.cpp sdl-sound.cpp sdl-throttle.cpp sdl-video.cpp -sdl-video.h -throttle.h unix-netplay.cpp -unix-netplay.h -usage.h """) # XXX need to deal with opengl configuration and testing at some point diff --git a/fir/SConscript b/fir/SConscript index 9d08bd21..ecdc9f9e 100644 --- a/fir/SConscript +++ b/fir/SConscript @@ -1,11 +1,5 @@ Import('file_list') my_list = Split(""" -c44100ntsc.h -c44100pal.h -c48000ntsc.h -c48000pal.h -c96000ntsc.h -c96000pal.h """) for x in range(len(my_list)): my_list[x] = 'fir/' + my_list[x] diff --git a/input/SConscript b/input/SConscript index 992a82cf..b929f155 100644 --- a/input/SConscript +++ b/input/SConscript @@ -4,7 +4,6 @@ arkanoid.cpp bworld.cpp cursor.cpp fkb.cpp -fkb.h ftrainer.cpp hypershot.cpp mahjong.cpp @@ -13,9 +12,7 @@ oekakids.cpp powerpad.cpp quiz.cpp shadow.cpp -share.h suborkb.cpp -suborkb.h toprider.cpp zapper.cpp """) diff --git a/mappers/SConscript b/mappers/SConscript index f35f3e7b..afa1507c 100644 --- a/mappers/SConscript +++ b/mappers/SConscript @@ -74,12 +74,8 @@ __226.cpp 97.cpp 99.cpp emu2413.c -emu2413.h -emutypes.h -mapinc.h mmc2and4.cpp simple.cpp -vrc7tone.h """) for x in range(len(my_list)): my_list[x] = 'mappers/' + my_list[x] diff --git a/palettes/SConscript b/palettes/SConscript index 6540a3c6..769e1bc5 100644 --- a/palettes/SConscript +++ b/palettes/SConscript @@ -1,11 +1,6 @@ Import('file_list') my_list = Split(""" conv.c -palettes.h -rp2c04001.h -rp2c04002.h -rp2c04003.h -rp2c05004.h """) for x in range(len(my_list)): my_list[x] = 'palettes/' + my_list[x]