From 96ea11dd6d9ef82151c20fa6c547b940a0f336f3 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sat, 5 Nov 2011 22:18:54 +0200
Subject: [PATCH] Move the wxwidgets stuff to one directory

---
 Makefile                                               | 4 ++--
 platform/wxwidgets/{src => }/authorseditor.cpp         | 0
 platform/wxwidgets/{src => }/authorseditor.hpp         | 0
 platform/wxwidgets/{src => }/axeseditor.cpp            | 0
 platform/wxwidgets/{src => }/axeseditor.hpp            | 0
 platform/wxwidgets/{src => }/callrom.cpp               | 0
 platform/wxwidgets/{src => }/callrom.hpp               | 0
 platform/wxwidgets/{src => }/common.cpp                | 0
 platform/wxwidgets/{src => }/common.hpp                | 0
 platform/wxwidgets/{src => }/emufn.cpp                 | 0
 platform/wxwidgets/{src => }/emufn.hpp                 | 0
 platform/wxwidgets/{src => }/filenamebox.cpp           | 0
 platform/wxwidgets/{src => }/filenamebox.hpp           | 0
 platform/wxwidgets/{src => }/keyentry.cpp              | 0
 platform/wxwidgets/{src => }/keyentry.hpp              | 0
 platform/wxwidgets/{src => }/labelcombobox.cpp         | 0
 platform/wxwidgets/{src => }/labelcombobox.hpp         | 0
 platform/wxwidgets/main-wxwidgets.cpp                  | 6 +++---
 platform/wxwidgets/{src => }/messages_window.cpp       | 0
 platform/wxwidgets/{src => }/messages_window.hpp       | 0
 platform/wxwidgets/{src => }/project_select_window.cpp | 0
 platform/wxwidgets/{src => }/project_select_window.hpp | 0
 platform/wxwidgets/{src => }/rom_patch_window.cpp      | 0
 platform/wxwidgets/{src => }/rom_patch_window.hpp      | 0
 platform/wxwidgets/{src => }/rom_select_window.cpp     | 0
 platform/wxwidgets/{src => }/rom_select_window.hpp     | 0
 platform/wxwidgets/{src => }/settingseditor.cpp        | 0
 platform/wxwidgets/{src => }/settingseditor.hpp        | 0
 platform/wxwidgets/{src => }/status_window.cpp         | 0
 platform/wxwidgets/{src => }/status_window.hpp         | 0
 30 files changed, 5 insertions(+), 5 deletions(-)
 rename platform/wxwidgets/{src => }/authorseditor.cpp (100%)
 rename platform/wxwidgets/{src => }/authorseditor.hpp (100%)
 rename platform/wxwidgets/{src => }/axeseditor.cpp (100%)
 rename platform/wxwidgets/{src => }/axeseditor.hpp (100%)
 rename platform/wxwidgets/{src => }/callrom.cpp (100%)
 rename platform/wxwidgets/{src => }/callrom.hpp (100%)
 rename platform/wxwidgets/{src => }/common.cpp (100%)
 rename platform/wxwidgets/{src => }/common.hpp (100%)
 rename platform/wxwidgets/{src => }/emufn.cpp (100%)
 rename platform/wxwidgets/{src => }/emufn.hpp (100%)
 rename platform/wxwidgets/{src => }/filenamebox.cpp (100%)
 rename platform/wxwidgets/{src => }/filenamebox.hpp (100%)
 rename platform/wxwidgets/{src => }/keyentry.cpp (100%)
 rename platform/wxwidgets/{src => }/keyentry.hpp (100%)
 rename platform/wxwidgets/{src => }/labelcombobox.cpp (100%)
 rename platform/wxwidgets/{src => }/labelcombobox.hpp (100%)
 rename platform/wxwidgets/{src => }/messages_window.cpp (100%)
 rename platform/wxwidgets/{src => }/messages_window.hpp (100%)
 rename platform/wxwidgets/{src => }/project_select_window.cpp (100%)
 rename platform/wxwidgets/{src => }/project_select_window.hpp (100%)
 rename platform/wxwidgets/{src => }/rom_patch_window.cpp (100%)
 rename platform/wxwidgets/{src => }/rom_patch_window.hpp (100%)
 rename platform/wxwidgets/{src => }/rom_select_window.cpp (100%)
 rename platform/wxwidgets/{src => }/rom_select_window.hpp (100%)
 rename platform/wxwidgets/{src => }/settingseditor.cpp (100%)
 rename platform/wxwidgets/{src => }/settingseditor.hpp (100%)
 rename platform/wxwidgets/{src => }/status_window.cpp (100%)
 rename platform/wxwidgets/{src => }/status_window.hpp (100%)

diff --git a/Makefile b/Makefile
index f5e70021..4d841952 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ platform/SDL/%.$(OBJECT_SUFFIX): platform/SDL/%.cpp
 	$(REALCC) -I. -Igeneric -g -std=gnu++0x -I$(BSNES_PATH) -c -o $@ $< $(CFLAGS) $(PLATFORM_CFLAGS)
 else
 ifeq ($(GRAPHICS), WXWIDGETS)
-PLATFORM_OBJECTS += platform/wxwidgets/main-wxwidgets.$(OBJECT_SUFFIX) $(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard platform/wxwidgets/src/*.cpp))
+PLATFORM_OBJECTS += $(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(wildcard platform/wxwidgets/*.cpp))
 PLATFORM_CFLAGS += $(shell $(CROSS_PREFIX)wx-config --cxxflags) $(shell $(CROSS_PREFIX)pkg-config libswscale --cflags)
 PLATFORM_LDFLAGS += $(shell $(CROSS_PREFIX)wx-config --libs) $(shell $(CROSS_PREFIX)pkg-config libswscale --libs)
 platform/wxwidgets/%.$(OBJECT_SUFFIX): platform/wxwidgets/%.cpp
@@ -137,4 +137,4 @@ fonts/parsehexfont.$(EXECUTABLE_SUFFIX): fonts/parsehexfont.cpp
 	$(HOSTCC) -std=gnu++0x $(HOSTCCFLAGS) -o $@ $^
 
 clean:
-	rm -f $(PROGRAMS) $(patsubst %.$(EXECUTABLE_SUFFIX),%.$(OBJECT_SUFFIX),$(PROGRAMS)) platform/*/*.$(OBJECT_SUFFIX) platform/*/src/*.$(OBJECT_SUFFIX) avidump/*.$(OBJECT_SUFFIX) generic/*.$(OBJECT_SUFFIX) lua/*.$(OBJECT_SUFFIX) fonts/font.o fonts/font.cpp
+	rm -f $(PROGRAMS) $(patsubst %.$(EXECUTABLE_SUFFIX),%.$(OBJECT_SUFFIX),$(PROGRAMS)) platform/*/*.$(OBJECT_SUFFIX)  avidump/*.$(OBJECT_SUFFIX) generic/*.$(OBJECT_SUFFIX) lua/*.$(OBJECT_SUFFIX) fonts/font.o fonts/font.cpp
diff --git a/platform/wxwidgets/src/authorseditor.cpp b/platform/wxwidgets/authorseditor.cpp
similarity index 100%
rename from platform/wxwidgets/src/authorseditor.cpp
rename to platform/wxwidgets/authorseditor.cpp
diff --git a/platform/wxwidgets/src/authorseditor.hpp b/platform/wxwidgets/authorseditor.hpp
similarity index 100%
rename from platform/wxwidgets/src/authorseditor.hpp
rename to platform/wxwidgets/authorseditor.hpp
diff --git a/platform/wxwidgets/src/axeseditor.cpp b/platform/wxwidgets/axeseditor.cpp
similarity index 100%
rename from platform/wxwidgets/src/axeseditor.cpp
rename to platform/wxwidgets/axeseditor.cpp
diff --git a/platform/wxwidgets/src/axeseditor.hpp b/platform/wxwidgets/axeseditor.hpp
similarity index 100%
rename from platform/wxwidgets/src/axeseditor.hpp
rename to platform/wxwidgets/axeseditor.hpp
diff --git a/platform/wxwidgets/src/callrom.cpp b/platform/wxwidgets/callrom.cpp
similarity index 100%
rename from platform/wxwidgets/src/callrom.cpp
rename to platform/wxwidgets/callrom.cpp
diff --git a/platform/wxwidgets/src/callrom.hpp b/platform/wxwidgets/callrom.hpp
similarity index 100%
rename from platform/wxwidgets/src/callrom.hpp
rename to platform/wxwidgets/callrom.hpp
diff --git a/platform/wxwidgets/src/common.cpp b/platform/wxwidgets/common.cpp
similarity index 100%
rename from platform/wxwidgets/src/common.cpp
rename to platform/wxwidgets/common.cpp
diff --git a/platform/wxwidgets/src/common.hpp b/platform/wxwidgets/common.hpp
similarity index 100%
rename from platform/wxwidgets/src/common.hpp
rename to platform/wxwidgets/common.hpp
diff --git a/platform/wxwidgets/src/emufn.cpp b/platform/wxwidgets/emufn.cpp
similarity index 100%
rename from platform/wxwidgets/src/emufn.cpp
rename to platform/wxwidgets/emufn.cpp
diff --git a/platform/wxwidgets/src/emufn.hpp b/platform/wxwidgets/emufn.hpp
similarity index 100%
rename from platform/wxwidgets/src/emufn.hpp
rename to platform/wxwidgets/emufn.hpp
diff --git a/platform/wxwidgets/src/filenamebox.cpp b/platform/wxwidgets/filenamebox.cpp
similarity index 100%
rename from platform/wxwidgets/src/filenamebox.cpp
rename to platform/wxwidgets/filenamebox.cpp
diff --git a/platform/wxwidgets/src/filenamebox.hpp b/platform/wxwidgets/filenamebox.hpp
similarity index 100%
rename from platform/wxwidgets/src/filenamebox.hpp
rename to platform/wxwidgets/filenamebox.hpp
diff --git a/platform/wxwidgets/src/keyentry.cpp b/platform/wxwidgets/keyentry.cpp
similarity index 100%
rename from platform/wxwidgets/src/keyentry.cpp
rename to platform/wxwidgets/keyentry.cpp
diff --git a/platform/wxwidgets/src/keyentry.hpp b/platform/wxwidgets/keyentry.hpp
similarity index 100%
rename from platform/wxwidgets/src/keyentry.hpp
rename to platform/wxwidgets/keyentry.hpp
diff --git a/platform/wxwidgets/src/labelcombobox.cpp b/platform/wxwidgets/labelcombobox.cpp
similarity index 100%
rename from platform/wxwidgets/src/labelcombobox.cpp
rename to platform/wxwidgets/labelcombobox.cpp
diff --git a/platform/wxwidgets/src/labelcombobox.hpp b/platform/wxwidgets/labelcombobox.hpp
similarity index 100%
rename from platform/wxwidgets/src/labelcombobox.hpp
rename to platform/wxwidgets/labelcombobox.hpp
diff --git a/platform/wxwidgets/main-wxwidgets.cpp b/platform/wxwidgets/main-wxwidgets.cpp
index dfce9d59..456353fb 100644
--- a/platform/wxwidgets/main-wxwidgets.cpp
+++ b/platform/wxwidgets/main-wxwidgets.cpp
@@ -15,9 +15,9 @@
 #include "misc.hpp"
 #include "window.hpp"
 #include "lua.hpp"
-#include "src/rom_select_window.hpp"
-#include "src/messages_window.hpp"
-#include "src/status_window.hpp"
+#include "rom_select_window.hpp"
+#include "messages_window.hpp"
+#include "status_window.hpp"
 
 class lsnes_app : public wxApp
 {
diff --git a/platform/wxwidgets/src/messages_window.cpp b/platform/wxwidgets/messages_window.cpp
similarity index 100%
rename from platform/wxwidgets/src/messages_window.cpp
rename to platform/wxwidgets/messages_window.cpp
diff --git a/platform/wxwidgets/src/messages_window.hpp b/platform/wxwidgets/messages_window.hpp
similarity index 100%
rename from platform/wxwidgets/src/messages_window.hpp
rename to platform/wxwidgets/messages_window.hpp
diff --git a/platform/wxwidgets/src/project_select_window.cpp b/platform/wxwidgets/project_select_window.cpp
similarity index 100%
rename from platform/wxwidgets/src/project_select_window.cpp
rename to platform/wxwidgets/project_select_window.cpp
diff --git a/platform/wxwidgets/src/project_select_window.hpp b/platform/wxwidgets/project_select_window.hpp
similarity index 100%
rename from platform/wxwidgets/src/project_select_window.hpp
rename to platform/wxwidgets/project_select_window.hpp
diff --git a/platform/wxwidgets/src/rom_patch_window.cpp b/platform/wxwidgets/rom_patch_window.cpp
similarity index 100%
rename from platform/wxwidgets/src/rom_patch_window.cpp
rename to platform/wxwidgets/rom_patch_window.cpp
diff --git a/platform/wxwidgets/src/rom_patch_window.hpp b/platform/wxwidgets/rom_patch_window.hpp
similarity index 100%
rename from platform/wxwidgets/src/rom_patch_window.hpp
rename to platform/wxwidgets/rom_patch_window.hpp
diff --git a/platform/wxwidgets/src/rom_select_window.cpp b/platform/wxwidgets/rom_select_window.cpp
similarity index 100%
rename from platform/wxwidgets/src/rom_select_window.cpp
rename to platform/wxwidgets/rom_select_window.cpp
diff --git a/platform/wxwidgets/src/rom_select_window.hpp b/platform/wxwidgets/rom_select_window.hpp
similarity index 100%
rename from platform/wxwidgets/src/rom_select_window.hpp
rename to platform/wxwidgets/rom_select_window.hpp
diff --git a/platform/wxwidgets/src/settingseditor.cpp b/platform/wxwidgets/settingseditor.cpp
similarity index 100%
rename from platform/wxwidgets/src/settingseditor.cpp
rename to platform/wxwidgets/settingseditor.cpp
diff --git a/platform/wxwidgets/src/settingseditor.hpp b/platform/wxwidgets/settingseditor.hpp
similarity index 100%
rename from platform/wxwidgets/src/settingseditor.hpp
rename to platform/wxwidgets/settingseditor.hpp
diff --git a/platform/wxwidgets/src/status_window.cpp b/platform/wxwidgets/status_window.cpp
similarity index 100%
rename from platform/wxwidgets/src/status_window.cpp
rename to platform/wxwidgets/status_window.cpp
diff --git a/platform/wxwidgets/src/status_window.hpp b/platform/wxwidgets/status_window.hpp
similarity index 100%
rename from platform/wxwidgets/src/status_window.hpp
rename to platform/wxwidgets/status_window.hpp
-- 
2.11.4.GIT