From 0da8befb8d9a19a69d6e78d067926621e35162c6 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Sat, 19 Jan 2013 14:03:25 +0200 Subject: [PATCH] Get rid of partial linking Partial linking doesn't seem to work right with MXE. --- .gitignore | 1 + src/Makefile | 44 ++++++++++++++++------------ src/core/Makefile | 8 ++--- src/dummy/Makefile | 8 ++--- src/emulation/Makefile | 16 +++++----- src/emulation/bsnes-legacy/Makefile | 13 ++++---- src/emulation/bsnes-legacy/dummy.cpp | 1 - src/emulation/gambatte/Makefile | 13 ++++---- src/emulation/gambatte/dummy.cpp | 1 - src/fonts/Makefile | 8 ++--- src/genfilelist.lua | 29 ++++++++++++++++++ src/interface/Makefile | 8 ++--- src/library/Makefile | 8 ++--- src/library/dummy.cpp | 1 - src/lua/Makefile | 8 ++--- src/platform/Makefile | 24 +++++++-------- src/platform/dummy/Makefile | 10 +++---- src/platform/dummy/dummy.cpp | 1 - src/platform/evdev/Makefile | 10 +++---- src/platform/evdev/dummy.cpp | 1 - src/platform/libao/Makefile | 11 ++++--- src/platform/libao/dummy.cpp | 1 - src/platform/portaudio/Makefile | 10 +++---- src/platform/portaudio/dummy.cpp | 1 - src/platform/win32mm/Makefile | 10 +++---- src/platform/win32mm/dummy.cpp | 1 - src/platform/wxwidgets/Makefile | 8 ++--- src/platform/wxwidgets/dummy.cpp | 1 - src/util/Makefile | 2 +- src/video/Makefile | 12 ++++---- src/video/avi/Makefile | 12 ++++---- src/video/avi/codec/Makefile | 14 ++++----- src/video/avi/codec/audio/Makefile | 8 ++--- src/video/avi/codec/video/Makefile | 8 ++--- 34 files changed, 170 insertions(+), 142 deletions(-) delete mode 100644 src/emulation/bsnes-legacy/dummy.cpp delete mode 100644 src/emulation/gambatte/dummy.cpp create mode 100644 src/genfilelist.lua delete mode 100644 src/library/dummy.cpp delete mode 100644 src/platform/dummy/dummy.cpp delete mode 100644 src/platform/evdev/dummy.cpp delete mode 100644 src/platform/libao/dummy.cpp delete mode 100644 src/platform/portaudio/dummy.cpp delete mode 100644 src/platform/win32mm/dummy.cpp delete mode 100644 src/platform/wxwidgets/dummy.cpp diff --git a/.gitignore b/.gitignore index 4936c269..cc37dbb1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.obj *.exe *.ldflags +*.files docs rom lsnes diff --git a/src/Makefile b/src/Makefile index 56ecea0c..64c34019 100644 --- a/src/Makefile +++ b/src/Makefile @@ -20,38 +20,44 @@ CFLAGS += -DWITH_OPUS_CODEC LDFLAGS += -lopus endif -DUMMY_LIBRARY=core lua fonts library interface video emulation dummy -PLATFORM_LIBRARY=core lua fonts library interface video emulation platform -ALLOBJECT=__all__.$(OBJECT_SUFFIX) +COMMON_LIBRARY=core lua fonts library interface video emulation +DUMMY_LIBRARY=$(COMMON_LIBRARY) dummy +PLATFORM_LIBRARY=$(COMMON_LIBRARY) platform +ALLFILES=__all__.files ALLFLAGS=__all__.ldflags -DUMMY_LIBRARY_OBJS=$(patsubst %,%/$(ALLOBJECT),$(DUMMY_LIBRARY)) -PLATFORM_LIBRARY_OBJS=$(patsubst %,%/$(ALLOBJECT),$(PLATFORM_LIBRARY)) +DUMMY_LIBRARY_FILES=$(patsubst %,%/$(ALLFILES),$(DUMMY_LIBRARY)) +PLATFORM_LIBRARY_FILES=$(patsubst %,%/$(ALLFILES),$(PLATFORM_LIBRARY)) DUMMY_LIBRARY_FLAGS=$(patsubst %,%/$(ALLFLAGS),$(DUMMY_LIBRARY)) PLATFORM_LIBRARY_FLAGS=$(patsubst %,%/$(ALLFLAGS),$(PLATFORM_LIBRARY)) +__all_dummy__.files: $(DUMMY_LIBRARY_FILES) + lua genfilelist.lua $^ >$@ -core/$(ALLOBJECT): forcelook +__all_platform__.files: $(PLATFORM_LIBRARY_FILES) + lua genfilelist.lua $^ >$@ + +core/$(ALLFILES): forcelook $(MAKE) -C core -dummy/$(ALLOBJECT): forcelook +dummy/$(ALLFILES): forcelook $(MAKE) -C dummy -emulation/$(ALLOBJECT): forcelook +emulation/$(ALLFILES): forcelook $(MAKE) -C emulation -fonts/$(ALLOBJECT): forcelook +fonts/$(ALLFILES): forcelook $(MAKE) -C fonts -library/$(ALLOBJECT): forcelook +library/$(ALLFILES): forcelook $(MAKE) -C library -interface/$(ALLOBJECT): forcelook +interface/$(ALLFILES): forcelook $(MAKE) -C interface -lua/$(ALLOBJECT): forcelook +lua/$(ALLFILES): forcelook $(MAKE) -C lua -platform/$(ALLOBJECT): forcelook +platform/$(ALLFILES): forcelook $(MAKE) -C platform util/__all_files__: forcelook @@ -60,16 +66,16 @@ util/__all_files__: forcelook util/%.$(OBJECT_SUFFIX): util/__all_files__ @true; -video/$(ALLOBJECT): forcelook +video/$(ALLFILES): forcelook $(MAKE) -C video -.PRECIOUS: %.$(OBJECT_SUFFIX) util/%.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) util/%.$(OBJECT_SUFFIX) %.files -%.util$(DOT_EXECUTABLE_SUFFIX): %.$(OBJECT_SUFFIX) $(DUMMY_LIBRARY_OBJS) - $(REALCC) -o $@ $^ $(LDFLAGS) $(CORE_OBJECT) `cat $(DUMMY_LIBRARY_FLAGS)` +%.util$(DOT_EXECUTABLE_SUFFIX): %.$(OBJECT_SUFFIX) __all_dummy__.files + $(REALCC) -o $@ $< `cat __all_dummy__.files` $(LDFLAGS) `cat $(DUMMY_LIBRARY_FLAGS)` -lsnes$(DOT_EXECUTABLE_SUFFIX): $(PLATFORM_LIBRARY_OBJS) - $(REALCC) -o $@ $^ $(LDFLAGS) $(CORE_OBJECT) `cat $(PLATFORM_LIBRARY_FLAGS)` +lsnes$(DOT_EXECUTABLE_SUFFIX): __all_platform__.files + $(REALCC) -o $@ `cat __all_platform__.files` $(LDFLAGS) `cat $(PLATFORM_LIBRARY_FLAGS)` precheck: $(MAKE) -C core precheck diff --git a/src/core/Makefile b/src/core/Makefile index 4cf17fc4..c4e18552 100644 --- a/src/core/Makefile +++ b/src/core/Makefile @@ -1,9 +1,9 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../genfilelist.lua $^ >$@ touch __all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -13,4 +13,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/dummy/Makefile b/src/dummy/Makefile index 5fae32bc..d7eb3d7e 100644 --- a/src/dummy/Makefile +++ b/src/dummy/Makefile @@ -1,9 +1,9 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../genfilelist.lua $^ >$@ touch __all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -13,4 +13,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/emulation/Makefile b/src/emulation/Makefile index a495c922..d8041c03 100644 --- a/src/emulation/Makefile +++ b/src/emulation/Makefile @@ -1,27 +1,27 @@ CORES=bsnes-legacy gambatte -ALLOBJECT=__all__.$(OBJECT_SUFFIX) +ALLFILES=__all__.files ALLFLAGS=__all__.ldflags -CORES_OBJS=$(patsubst %,%/$(ALLOBJECT),$(CORES)) +CORES_FILES=$(patsubst %,%/$(ALLFILES),$(CORES)) CORES_FLAGS=$(patsubst %,%/$(ALLFLAGS),$(CORES)) -$(ALLOBJECT): $(CORES_OBJS) - $(REALLD) -r -o $@ $^ +__all__.files: $(CORES_FILES) + lua ../genfilelist.lua $^ >$@ cat $(CORES_FLAGS) >$(ALLFLAGS) -bsnes-legacy/$(ALLOBJECT): forcelook +bsnes-legacy/$(ALLFILES): forcelook $(MAKE) -C bsnes-legacy -gambatte/$(ALLOBJECT): forcelook +gambatte/$(ALLFILES): forcelook $(MAKE) -C gambatte -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files precheck: $(MAKE) -C bsnes-legacy precheck $(MAKE) -C gambatte precheck clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files $(MAKE) -C bsnes-legacy clean $(MAKE) -C gambatte clean diff --git a/src/emulation/bsnes-legacy/Makefile b/src/emulation/bsnes-legacy/Makefile index 2e418644..8487cb0e 100644 --- a/src/emulation/bsnes-legacy/Makefile +++ b/src/emulation/bsnes-legacy/Makefile @@ -27,10 +27,10 @@ CFLAGS += -DBSNES_VERSION=\"${BSNES_VERSION}\" BSNES_LIBRARY=bsnes/out/libsnes.$(ARCHIVE_SUFFIX) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) ../../../$(BSNES_LIBRARY) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) ../../../$(BSNES_LIBRARY) + lua ../../genfilelist.lua $^ >$@ echo $(BSNES_LDFLAGS) ../$(BSNES_LIBRARY) >__all__.ldflags ../../../$(BSNES_LIBRARY): forcelook @@ -51,8 +51,9 @@ regions.inc: regions.def ../make-regions.lua $(REALCC) -c -o $@ $< -I../../../include -I../../../bsnes $(CFLAGS) $(BSNES_CFLAGS) else -__all__.$(OBJECT_SUFFIX): dummy.cpp - $(REALCC) -c -o $@ $< $(CFLAGS) +OBJECTS= +__all__.files: $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ echo >__all__.ldflags endif @@ -64,5 +65,5 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.files __all__.ldflags -make -C ../../../bsnes clean diff --git a/src/emulation/bsnes-legacy/dummy.cpp b/src/emulation/bsnes-legacy/dummy.cpp deleted file mode 100644 index 270d1b68..00000000 --- a/src/emulation/bsnes-legacy/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_32662363263262733; \ No newline at end of file diff --git a/src/emulation/gambatte/Makefile b/src/emulation/gambatte/Makefile index 959adf5f..9f0af0c2 100644 --- a/src/emulation/gambatte/Makefile +++ b/src/emulation/gambatte/Makefile @@ -5,10 +5,10 @@ GAMBATTE_LDFLAGS= GAMBATTE_LIBRARY=gambatte/libgambatte/libgambatte.$(ARCHIVE_SUFFIX) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) ../../../$(GAMBATTE_LIBRARY) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) ../../../$(GAMBATTE_LIBRARY) + lua ../../genfilelist.lua $^ >$@ echo $(GAMBATTE_LDFLAGS) ../$(GAMBATTE_LIBRARY) >__all__.ldflags ../../../$(GAMBATTE_LIBRARY): forcelook @@ -29,8 +29,9 @@ regions.inc: regions.def ../make-regions.lua else -__all__.$(OBJECT_SUFFIX): dummy.cpp - $(REALCC) -c -o $@ $< $(CFLAGS) +OBJECTS= +__all__.files: $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ echo >__all__.ldflags endif @@ -43,4 +44,4 @@ precheck: clean: -make -C ../../../gambatte clean - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/emulation/gambatte/dummy.cpp b/src/emulation/gambatte/dummy.cpp deleted file mode 100644 index a2dc2a6c..00000000 --- a/src/emulation/gambatte/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_52896932693286932683296; diff --git a/src/fonts/Makefile b/src/fonts/Makefile index a86ced67..1ae1b038 100644 --- a/src/fonts/Makefile +++ b/src/fonts/Makefile @@ -1,9 +1,9 @@ OBJECTS=font.$(OBJECT_SUFFIX) wrapper.$(OBJECT_SUFFIX) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../genfilelist.lua $^ >$@ touch __all__.ldflags .PRECIOUS: font.$(OBJECT_SUFFIX) font.cpp @@ -20,4 +20,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) font.cpp *.ldflags + rm -f *.$(OBJECT_SUFFIX) font.cpp __all__.ldflags __all__.files diff --git a/src/genfilelist.lua b/src/genfilelist.lua new file mode 100644 index 00000000..058df649 --- /dev/null +++ b/src/genfilelist.lua @@ -0,0 +1,29 @@ +#!/usr/bin/env lua + +emit=function(filename) + local prefix, file, line, err, word; + if string.match(filename, "%.%./(.*)") then + return; + end + prefix = string.match(filename, "(.*/)[^/]*"); + if not prefix then + io.stdout:write(" " .. filename); + return; + end + file, err = io.open(filename, "r"); + if not file then + error(err); + end + s = ""; + for line in file:lines() do + for word in string.gmatch(line, "%S+") do + s = s .. " " .. prefix .. word; + end + end + io.stdout:write(s); +end + +for i=1,#arg do + emit(arg[i]); +end +print(""); \ No newline at end of file diff --git a/src/interface/Makefile b/src/interface/Makefile index 4cf17fc4..c4e18552 100644 --- a/src/interface/Makefile +++ b/src/interface/Makefile @@ -1,9 +1,9 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../genfilelist.lua $^ >$@ touch __all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -13,4 +13,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/library/Makefile b/src/library/Makefile index 2e13c767..b3d1e730 100644 --- a/src/library/Makefile +++ b/src/library/Makefile @@ -1,9 +1,9 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../genfilelist.lua $^ >$@ touch __all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -13,4 +13,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/library/dummy.cpp b/src/library/dummy.cpp deleted file mode 100644 index a50d0c1d..00000000 --- a/src/library/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_9632869328693208767947843684375823578323; diff --git a/src/lua/Makefile b/src/lua/Makefile index 04ad0fb3..ed310ded 100644 --- a/src/lua/Makefile +++ b/src/lua/Makefile @@ -1,9 +1,9 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../genfilelist.lua $^ >$@ echo >__all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -13,4 +13,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/platform/Makefile b/src/platform/Makefile index c91daea4..c4b17707 100644 --- a/src/platform/Makefile +++ b/src/platform/Makefile @@ -1,33 +1,33 @@ PLATFORMS=dummy evdev portaudio wxwidgets win32mm libao -ALLOBJECT=__all__.$(OBJECT_SUFFIX) +ALLFILES=__all__.files ALLFLAGS=__all__.ldflags -PLATFORMS_OBJS=$(patsubst %,%/$(ALLOBJECT),$(PLATFORMS)) +PLATFORMS_FILES=$(patsubst %,%/$(ALLFILES),$(PLATFORMS)) PLATFORMS_FLAGS=$(patsubst %,%/$(ALLFLAGS),$(PLATFORMS)) -$(ALLOBJECT): $(PLATFORMS_OBJS) - $(REALLD) -r -o $@ $^ +$(ALLFILES): $(PLATFORMS_FILES) $(OBJECTS) + lua ../genfilelist.lua $^ >$@ cat $(PLATFORMS_FLAGS) >$(ALLFLAGS) -dummy/$(ALLOBJECT): forcelook +dummy/$(ALLFILES): forcelook $(MAKE) -C dummy -evdev/$(ALLOBJECT): forcelook +evdev/$(ALLFILES): forcelook $(MAKE) -C evdev -win32mm/$(ALLOBJECT): forcelook +win32mm/$(ALLFILES): forcelook $(MAKE) -C win32mm -portaudio/$(ALLOBJECT): forcelook +portaudio/$(ALLFILES): forcelook $(MAKE) -C portaudio -libao/$(ALLOBJECT): forcelook +libao/$(ALLFILES): forcelook $(MAKE) -C libao -wxwidgets/$(ALLOBJECT): forcelook +wxwidgets/$(ALLFILES): forcelook $(MAKE) -C wxwidgets -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) *.files precheck: $(MAKE) -C dummy precheck @@ -38,7 +38,7 @@ precheck: $(MAKE) -C wxwidgets precheck clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files $(MAKE) -C dummy clean $(MAKE) -C evdev clean $(MAKE) -C win32mm clean diff --git a/src/platform/dummy/Makefile b/src/platform/dummy/Makefile index a1a9e352..d5b3819b 100644 --- a/src/platform/dummy/Makefile +++ b/src/platform/dummy/Makefile @@ -1,4 +1,4 @@ -OBJECTS=dummy.$(OBJECT_SUFFIX) +OBJECTS= ifeq ($(SOUND),DUMMY) OBJECTS += sound.$(OBJECT_SUFFIX) endif @@ -6,10 +6,10 @@ ifeq ($(JOYSTICK),DUMMY) OBJECTS += joystick.$(OBJECT_SUFFIX) endif -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ touch __all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -19,4 +19,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/platform/dummy/dummy.cpp b/src/platform/dummy/dummy.cpp deleted file mode 100644 index 9c1f4d55..00000000 --- a/src/platform/dummy/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_5236382638463274637825672865732473644642; diff --git a/src/platform/evdev/Makefile b/src/platform/evdev/Makefile index c73b4474..acf239a3 100644 --- a/src/platform/evdev/Makefile +++ b/src/platform/evdev/Makefile @@ -1,13 +1,13 @@ ifeq ($(JOYSTICK), EVDEV) OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) else -OBJECTS=dummy.$(OBJECT_SUFFIX) +OBJECTS= endif -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ touch __all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -17,4 +17,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/platform/evdev/dummy.cpp b/src/platform/evdev/dummy.cpp deleted file mode 100644 index bd20b02e..00000000 --- a/src/platform/evdev/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_7547375832742837589257382758375387238443; diff --git a/src/platform/libao/Makefile b/src/platform/libao/Makefile index f697d715..97d56ed3 100644 --- a/src/platform/libao/Makefile +++ b/src/platform/libao/Makefile @@ -3,14 +3,13 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) PA_CFLAGS += $(shell $(CROSS_PREFIX)pkg-config ao --cflags) PA_LDFLAGS += $(shell $(CROSS_PREFIX)pkg-config ao --libs) else -OBJECTS = dummy.$(OBJECT_SUFFIX) +OBJECTS= endif +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -.PRECIOUS: %.$(OBJECT_SUFFIX) - -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ echo $(PA_LDFLAGS) >__all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -20,4 +19,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/platform/libao/dummy.cpp b/src/platform/libao/dummy.cpp deleted file mode 100644 index eb779f90..00000000 --- a/src/platform/libao/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_3582389632875382734832758327674873248473; diff --git a/src/platform/portaudio/Makefile b/src/platform/portaudio/Makefile index 79c10c95..2df5cf4d 100644 --- a/src/platform/portaudio/Makefile +++ b/src/platform/portaudio/Makefile @@ -3,14 +3,14 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) PA_CFLAGS += $(shell $(CROSS_PREFIX)pkg-config portaudio-2.0 --cflags) PA_LDFLAGS += $(shell $(CROSS_PREFIX)pkg-config portaudio-2.0 --libs) else -OBJECTS = dummy.$(OBJECT_SUFFIX) +OBJECTS= endif -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ echo $(PA_LDFLAGS) >__all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -20,4 +20,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/platform/portaudio/dummy.cpp b/src/platform/portaudio/dummy.cpp deleted file mode 100644 index ee676919..00000000 --- a/src/platform/portaudio/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_5328598469839457284718924789753892769886; diff --git a/src/platform/win32mm/Makefile b/src/platform/win32mm/Makefile index 5705fbf9..3b39fb68 100644 --- a/src/platform/win32mm/Makefile +++ b/src/platform/win32mm/Makefile @@ -1,13 +1,13 @@ ifeq ($(JOYSTICK), WIN32MM) OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) else -OBJECTS=dummy.$(OBJECT_SUFFIX) +OBJECTS= endif -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ touch __all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -17,4 +17,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/platform/win32mm/dummy.cpp b/src/platform/win32mm/dummy.cpp deleted file mode 100644 index 8f4c3306..00000000 --- a/src/platform/win32mm/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_5825392786327896327896798437692738969832786; diff --git a/src/platform/wxwidgets/Makefile b/src/platform/wxwidgets/Makefile index 02dd1afe..3ff81ea6 100644 --- a/src/platform/wxwidgets/Makefile +++ b/src/platform/wxwidgets/Makefile @@ -3,7 +3,7 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) WXW_CFLAGS += $(shell $(CROSS_PREFIX)wx-config --cxxflags) $(shell $(CROSS_PREFIX)pkg-config libswscale --cflags) WXW_LDFLAGS += $(shell $(CROSS_PREFIX)wx-config --libs) $(shell $(CROSS_PREFIX)pkg-config libswscale --libs) else -OBJECTS = dummy.$(OBJECT_SUFFIX) +OBJECTS = endif ifeq ($(JOYSTICK), WXWIDGETS) @@ -16,8 +16,8 @@ endif .PRECIOUS: %.$(OBJECT_SUFFIX) -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ echo $(WXW_LDFLAGS) >__all__.ldflags %.$(OBJECT_SUFFIX): %.cpp @@ -27,4 +27,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/platform/wxwidgets/dummy.cpp b/src/platform/wxwidgets/dummy.cpp deleted file mode 100644 index f6f4e654..00000000 --- a/src/platform/wxwidgets/dummy.cpp +++ /dev/null @@ -1 +0,0 @@ -char SYMBOL_0532573275328678376328758327583274832744; diff --git a/src/util/Makefile b/src/util/Makefile index 0549b353..ed58a8be 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -1,6 +1,6 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files __all_files__: $(OBJECTS) @true diff --git a/src/video/Makefile b/src/video/Makefile index 5f45b6c9..7d488fc5 100644 --- a/src/video/Makefile +++ b/src/video/Makefile @@ -1,17 +1,17 @@ -OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) avi/__all__.$(OBJECT_SUFFIX) +OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) ifdef SECRET_RABBIT_CODE AVI_CFLAGS=-DWITH_SECRET_RABBIT_CODE AVI_LDFLAGS=-lsamplerate endif -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: avi/__all__.files $(OBJECTS) + lua ../genfilelist.lua $^ >$@ echo $(AVI_LDFLAGS) >__all__.ldflags -avi/__all__.$(OBJECT_SUFFIX): forcelook +avi/__all__.files: forcelook $(MAKE) -C avi %.$(OBJECT_SUFFIX): %.cpp @@ -25,4 +25,4 @@ precheck: clean: $(MAKE) -C avi clean - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/video/avi/Makefile b/src/video/avi/Makefile index 8f148aa6..592eb81b 100644 --- a/src/video/avi/Makefile +++ b/src/video/avi/Makefile @@ -1,11 +1,11 @@ -OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) codec/__all__.$(OBJECT_SUFFIX) +OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: codec/__all__.files $(OBJECTS) + lua ../../genfilelist.lua $^ >$@ -codec/__all__.$(OBJECT_SUFFIX): forcelook +codec/__all__.files: forcelook $(MAKE) -C codec %.$(OBJECT_SUFFIX): %.cpp @@ -19,4 +19,4 @@ precheck: clean: $(MAKE) -C codec clean - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/video/avi/codec/Makefile b/src/video/avi/codec/Makefile index b8255f61..730d7992 100644 --- a/src/video/avi/codec/Makefile +++ b/src/video/avi/codec/Makefile @@ -1,14 +1,14 @@ -OBJECTS=video/__all__.$(OBJECT_SUFFIX) audio/__all__.$(OBJECT_SUFFIX) +OBJECTS= -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: audio/__all__.files video/__all__.files $(OBJECTS) + lua ../../../genfilelist.lua $^ >$@ -audio/__all__.$(OBJECT_SUFFIX): forcelook +audio/__all__.files: forcelook $(MAKE) -C audio -video/__all__.$(OBJECT_SUFFIX): forcelook +video/__all__.files: forcelook $(MAKE) -C video %.$(OBJECT_SUFFIX): %.cpp @@ -24,4 +24,4 @@ precheck: clean: $(MAKE) -C audio clean $(MAKE) -C video clean - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/video/avi/codec/audio/Makefile b/src/video/avi/codec/audio/Makefile index 34b0230c..c45639ce 100644 --- a/src/video/avi/codec/audio/Makefile +++ b/src/video/avi/codec/audio/Makefile @@ -1,9 +1,9 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../../../../genfilelist.lua $^ >$@ %.$(OBJECT_SUFFIX): %.cpp $(REALCC) $(CFLAGS) -c -o $@ $< -I../../../../../include @@ -12,4 +12,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files diff --git a/src/video/avi/codec/video/Makefile b/src/video/avi/codec/video/Makefile index 34b0230c..c45639ce 100644 --- a/src/video/avi/codec/video/Makefile +++ b/src/video/avi/codec/video/Makefile @@ -1,9 +1,9 @@ OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) -.PRECIOUS: %.$(OBJECT_SUFFIX) +.PRECIOUS: %.$(OBJECT_SUFFIX) %.files -__all__.$(OBJECT_SUFFIX): $(OBJECTS) - $(REALLD) -r -o $@ $^ +__all__.files: $(OBJECTS) + lua ../../../../genfilelist.lua $^ >$@ %.$(OBJECT_SUFFIX): %.cpp $(REALCC) $(CFLAGS) -c -o $@ $< -I../../../../../include @@ -12,4 +12,4 @@ precheck: @true clean: - rm -f *.$(OBJECT_SUFFIX) *.ldflags + rm -f *.$(OBJECT_SUFFIX) __all__.ldflags __all__.files