More code file moving

Move platform files from src/plat-* to src/platform/* (and similarly
for include files).

include/platform/wxwidgets/window_mainwindow.hpp

@@ -1,7 +1,7 @@
 #ifndef _plat_wxwidgets__window_mainwindow__hpp__included__
 #define _plat_wxwidgets__window_mainwindow__hpp__included__
 
-#include "plat-wxwidgets/window_status.hpp"
+#include "platform/wxwidgets/window_status.hpp"
 
 #include <stack>
 

src/Makefile

@@ -2,8 +2,8 @@ __all_files__: util/__all_files__ \
 	lsnes$(DOT_EXECUTABLE_SUFFIX) \
 	$(patsubst %.cpp,%.util$(DOT_EXECUTABLE_SUFFIX),$(wildcard util/*.cpp))
 
-DUMMY_LIBRARY=core lua fonts video dummy
-PLATFORM_LIBRARY=core lua fonts video plat-dummy plat-evdev plat-portaudio plat-sdl plat-wxwidgets
+DUMMY_LIBRARY=core lua fonts library video dummy
+PLATFORM_LIBRARY=core lua fonts library video platform
 ALLOBJECT=__all__.$(OBJECT_SUFFIX)
 ALLFLAGS=__all__.ldflags
 DUMMY_LIBRARY_OBJS=$(patsubst %,%/$(ALLOBJECT),$(DUMMY_LIBRARY))
@@ -24,20 +24,11 @@ lua/$(ALLOBJECT): forcelook
 dummy/$(ALLOBJECT): forcelook
 	$(MAKE) -C dummy
 
-plat-dummy/$(ALLOBJECT): forcelook
-	$(MAKE) -C plat-dummy
+library/$(ALLOBJECT): forcelook
+	$(MAKE) -C library
 
-plat-evdev/$(ALLOBJECT): forcelook
-	$(MAKE) -C plat-evdev
-
-plat-portaudio/$(ALLOBJECT): forcelook
-	$(MAKE) -C plat-portaudio
-
-plat-sdl/$(ALLOBJECT): forcelook
-	$(MAKE) -C plat-sdl
-
-plat-wxwidgets/$(ALLOBJECT): forcelook
-	$(MAKE) -C plat-wxwidgets
+platform/$(ALLOBJECT): forcelook
+	$(MAKE) -C platform
 
 util/__all_files__: forcelook
 	$(MAKE) -C util
@@ -59,11 +50,9 @@ lsnes$(DOT_EXECUTABLE_SUFFIX): $(PLATFORM_LIBRARY_OBJS)
 precheck:
 	$(MAKE) -C core precheck
 	$(MAKE) -C lua precheck
-	$(MAKE) -C plat-dummy precheck
-	$(MAKE) -C plat-evdev precheck
-	$(MAKE) -C plat-portaudio precheck
-	$(MAKE) -C plat-sdl precheck
-	$(MAKE) -C plat-wxwidgets precheck
+	$(MAKE) -C dummy precheck
+	$(MAKE) -C library precheck
+	$(MAKE) -C platform precheck
 	$(MAKE) -C util precheck
 	$(MAKE) -C video precheck
 
@@ -71,11 +60,9 @@ clean:
 	rm -f *.ldflags
 	$(MAKE) -C core clean
 	$(MAKE) -C lua clean
-	$(MAKE) -C plat-dummy clean
-	$(MAKE) -C plat-evdev clean
-	$(MAKE) -C plat-portaudio clean
-	$(MAKE) -C plat-sdl clean
-	$(MAKE) -C plat-wxwidgets clean
+	$(MAKE) -C dummy clean
+	$(MAKE) -C library clean
+	$(MAKE) -C platform clean
 	$(MAKE) -C util clean
 	$(MAKE) -C video clean
 

src/library/Makefile

@@ -0,0 +1,16 @@
+OBJECTS=$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard *.cpp)) 
+
+.PRECIOUS: %.$(OBJECT_SUFFIX)
+
+__all__.$(OBJECT_SUFFIX): $(OBJECTS)
+	$(REALLD) -r -o $@ $^
+	touch __all__.ldflags
+
+%.$(OBJECT_SUFFIX): %.cpp
+	$(REALCC) $(CFLAGS) -c -o $@ $< -I../../include
+
+precheck:
+	@true
+
+clean:
+	rm -f *.$(OBJECT_SUFFIX) *.ldflags

src/platform/Makefile

@@ -0,0 +1,45 @@
+PLATFORMS=dummy evdev portaudio sdl wxwidgets
+ALLOBJECT=__all__.$(OBJECT_SUFFIX)
+ALLFLAGS=__all__.ldflags
+PLATFORMS_OBJS=$(patsubst %,%/$(ALLOBJECT),$(PLATFORMS))
+PLATFORMS_FLAGS=$(patsubst %,%/$(ALLFLAGS),$(PLATFORMS))
+
+$(ALLOBJECT): $(PLATFORMS_OBJS)
+	ld -r -o $@ $^
+	cat $(PLATFORMS_FLAGS) >$(ALLFLAGS)
+
+dummy/$(ALLOBJECT): forcelook
+	$(MAKE) -C dummy
+
+evdev/$(ALLOBJECT): forcelook
+	$(MAKE) -C evdev
+
+portaudio/$(ALLOBJECT): forcelook
+	$(MAKE) -C portaudio
+
+sdl/$(ALLOBJECT): forcelook
+	$(MAKE) -C sdl
+
+wxwidgets/$(ALLOBJECT): forcelook
+	$(MAKE) -C wxwidgets
+
+
+.PRECIOUS: %.$(OBJECT_SUFFIX)
+
+precheck:
+	$(MAKE) -C dummy precheck
+	$(MAKE) -C evdev precheck
+	$(MAKE) -C portaudio precheck
+	$(MAKE) -C sdl precheck
+	$(MAKE) -C wxwidgets precheck
+
+clean:
+	rm -f *.ldflags
+	$(MAKE) -C dummy clean
+	$(MAKE) -C evdev clean
+	$(MAKE) -C portaudio clean
+	$(MAKE) -C sdl clean
+	$(MAKE) -C wxwidgets clean
+
+forcelook:
+	@true

src/platform/dummy/Makefile

@@ -13,7 +13,7 @@ __all__.$(OBJECT_SUFFIX): $(OBJECTS)
 	touch __all__.ldflags
 
 %.$(OBJECT_SUFFIX): %.cpp
-	$(REALCC) -c -o $@ $< -I../../include $(CFLAGS)
+	$(REALCC) -c -o $@ $< -I../../../include $(CFLAGS)
 
 precheck:
 	@true

src/platform/evdev/Makefile

@@ -11,7 +11,7 @@ __all__.$(OBJECT_SUFFIX): $(OBJECTS)
 	touch __all__.ldflags
 
 %.$(OBJECT_SUFFIX): %.cpp
-	$(REALCC) -c -o $@ $< -I../../include $(CFLAGS)
+	$(REALCC) -c -o $@ $< -I../../../include $(CFLAGS)
 
 precheck:
 	@true

src/platform/portaudio/Makefile

@@ -14,7 +14,7 @@ __all__.$(OBJECT_SUFFIX): $(OBJECTS)
 	echo $(PA_LDFLAGS) >__all__.ldflags
 
 %.$(OBJECT_SUFFIX): %.cpp
-	$(REALCC) -c -o $@ $< -I../../include $(CFLAGS) $(PA_CFLAGS)
+	$(REALCC) -c -o $@ $< -I../../../include $(CFLAGS) $(PA_CFLAGS)
 
 precheck:
 	@true

src/platform/sdl/Makefile

@@ -27,7 +27,7 @@ __all__.$(OBJECT_SUFFIX): $(OBJECTS)
 	echo $(SDL_LDFLAGS) >__all__.ldflags
 
 %.$(OBJECT_SUFFIX): %.cpp
-	$(REALCC) -c -o $@ $< -I../../include $(CFLAGS) $(SDL_CFLAGS)
+	$(REALCC) -c -o $@ $< -I../../../include $(CFLAGS) $(SDL_CFLAGS)
 
 precheck:
 	@true

src/platform/sdl/commandline.cpp

@@ -1,4 +1,4 @@
-#include "plat-sdl/platform.hpp"
+#include "platform/sdl/platform.hpp"
 
 #include <sstream>
 #define MAXHISTORY 1000

src/platform/sdl/drawprim.cpp

@@ -1,5 +1,5 @@
 #include "core/misc.hpp"
-#include "plat-sdl/platform.hpp"
+#include "platform/sdl/platform.hpp"
 
 #include <cstdint>
 #include <vector>

src/platform/sdl/graphicsfn.cpp

@@ -4,7 +4,7 @@
 #include "core/framebuffer.hpp"
 #include "core/framerate.hpp"
 #include "core/window.hpp"
-#include "plat-sdl/platform.hpp"
+#include "platform/sdl/platform.hpp"
 
 #include <unistd.h>
 

src/platform/sdl/joystick.cpp

@@ -1,5 +1,5 @@
 #include "core/window.hpp"
-#include "plat-sdl/platform.hpp"
+#include "platform/sdl/platform.hpp"
 
 #include <set>
 

src/platform/sdl/keyboard.cpp

@@ -1,5 +1,5 @@
 #include "core/window.hpp"
-#include "plat-sdl/platform.hpp"
+#include "platform/sdl/platform.hpp"
 
 #include <map>
 

src/platform/sdl/main.cpp

@@ -13,7 +13,7 @@
 #include "core/rrdata.hpp"
 #include "core/window.hpp"
 
-#include "plat-sdl/platform.hpp"
+#include "platform/sdl/platform.hpp"
 
 #include <sys/time.h>
 #include <sstream>

src/platform/sdl/status.cpp

@@ -1,5 +1,5 @@
 #include "core/framebuffer.hpp"
-#include "plat-sdl/platform.hpp"
+#include "platform/sdl/platform.hpp"
 
 void statusarea_model::paint(SDL_Surface* surf, uint32_t x, uint32_t y, uint32_t w, uint32_t h, uint32_t color,
 	bool box, uint32_t boxcolor) throw()

src/platform/wxwidgets/Makefile

@@ -14,7 +14,7 @@ __all__.$(OBJECT_SUFFIX): $(OBJECTS)
 	echo $(WXW_LDFLAGS) >__all__.ldflags
 
 %.$(OBJECT_SUFFIX): %.cpp
-	$(REALCC) -c -o $@ $< -I../../include $(CFLAGS) $(WXW_CFLAGS)
+	$(REALCC) -c -o $@ $< -I../../../include $(CFLAGS) $(WXW_CFLAGS)
 
 precheck:
 	@true

src/platform/wxwidgets/dumpmenu.cpp

@@ -1,8 +1,8 @@
 #include "core/advdumper.hpp"
 #include "core/dispatch.hpp"
 
-#include "plat-wxwidgets/menu_dump.hpp"
-#include "plat-wxwidgets/platform.hpp"
+#include "platform/wxwidgets/menu_dump.hpp"
+#include "platform/wxwidgets/platform.hpp"
 
 struct dumper_info
 {

src/platform/wxwidgets/editor-authors.cpp

@@ -1,6 +1,6 @@
 #include "core/moviedata.hpp"
 
-#include "plat-wxwidgets/platform.hpp"
+#include "platform/wxwidgets/platform.hpp"
 
 #include <wx/wx.h>
 #include <wx/event.h>

src/platform/wxwidgets/editor-axis.cpp

@@ -1,6 +1,6 @@
 #include "core/keymapper.hpp"
 
-#include "plat-wxwidgets/platform.hpp"
+#include "platform/wxwidgets/platform.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <sstream>

src/platform/wxwidgets/editor-settings.cpp

@@ -6,7 +6,7 @@
 #include "core/settings.hpp"
 #include "core/window.hpp"
 
-#include "plat-wxwidgets/platform.hpp"
+#include "platform/wxwidgets/platform.hpp"
 
 #include <fstream>
 #include <stdexcept>

src/platform/wxwidgets/main.cpp

@@ -19,11 +19,11 @@
 #include "core/window.hpp"
 #include "core/zip.hpp"
 
-#include "plat-wxwidgets/platform.hpp"
-#include "plat-wxwidgets/window_messages.hpp"
-#include "plat-wxwidgets/window_status.hpp"
-#include "plat-wxwidgets/window_mainwindow.hpp"
-#include "plat-wxwidgets/window_romselect.hpp"
+#include "platform/wxwidgets/platform.hpp"
+#include "platform/wxwidgets/window_messages.hpp"
+#include "platform/wxwidgets/window_status.hpp"
+#include "platform/wxwidgets/window_mainwindow.hpp"
+#include "platform/wxwidgets/window_romselect.hpp"
 
 #include <cassert>
 #include <boost/lexical_cast.hpp>

src/platform/wxwidgets/mainwindow.cpp

@@ -17,10 +17,10 @@
 #include <vector>
 #include <string>
 
-#include "plat-wxwidgets/menu_dump.hpp"
-#include "plat-wxwidgets/platform.hpp"
-#include "plat-wxwidgets/window_mainwindow.hpp"
-#include "plat-wxwidgets/window_status.hpp"
+#include "platform/wxwidgets/menu_dump.hpp"
+#include "platform/wxwidgets/platform.hpp"
+#include "platform/wxwidgets/window_mainwindow.hpp"
+#include "platform/wxwidgets/window_status.hpp"
 
 #define MAXCONTROLLERS MAX_PORTS * MAX_CONTROLLERS_PER_PORT
 

src/platform/wxwidgets/memorysearch.cpp

@@ -1,7 +1,7 @@
 #include "core/dispatch.hpp"
 #include "core/memorymanip.hpp"
 
-#include "plat-wxwidgets/platform.hpp"
+#include "platform/wxwidgets/platform.hpp"
 
 #include <sstream>
 #include <iomanip>

src/platform/wxwidgets/messages.cpp

@@ -1,7 +1,7 @@
 #include "core/window.hpp"
 
-#include "plat-wxwidgets/window_messages.hpp"
-#include "plat-wxwidgets/platform.hpp"
+#include "platform/wxwidgets/window_messages.hpp"
+#include "platform/wxwidgets/platform.hpp"
 
 #define MAXMESSAGES 20
 

src/platform/wxwidgets/romselect.cpp

@@ -9,8 +9,8 @@
 #include "core/framerate.hpp"
 #include "core/zip.hpp"
 
-#include "plat-wxwidgets/platform.hpp"
-#include "plat-wxwidgets/window_romselect.hpp"
+#include "platform/wxwidgets/platform.hpp"
+#include "platform/wxwidgets/window_romselect.hpp"
 
 #define ROM_SELECTS_BASE	(wxID_HIGHEST + 0)
 #define ROM_SELECTS_LAST	(wxID_HIGHEST + 127)

src/platform/wxwidgets/status.cpp

@@ -1,6 +1,6 @@
 #include "core/window.hpp"
-#include "plat-wxwidgets/platform.hpp"
-#include "plat-wxwidgets/window_status.hpp"
+#include "platform/wxwidgets/platform.hpp"
+#include "platform/wxwidgets/window_status.hpp"
 
 #define MAXSTATUS 30