From 82c3d8f242908520ab92616f259cbaf479597e77 Mon Sep 17 00:00:00 2001
From: Daniel Collins <solemnwarning@solemnwarning.net>
Date: Mon, 19 Sep 2011 00:49:31 +0000
Subject: [PATCH] Moved icon-related stuff to subdir.

---
 Makefile                                   |   8 ++++----
 ipxconfig-16.png => icons/ipxconfig-16.png | Bin
 ipxconfig-32.png => icons/ipxconfig-32.png | Bin
 ipxconfig.ico => icons/ipxconfig.ico       | Bin
 icons/ipxconfig.rc                         |   1 +
 ipxrouter-16.png => icons/ipxrouter-16.png | Bin
 ipxrouter-32.png => icons/ipxrouter-32.png | Bin
 ipxrouter.ico => icons/ipxrouter.ico       | Bin
 icons/ipxrouter.rc                         |   1 +
 src/ipxconfig.rc                           |   1 -
 src/ipxrouter.rc                           |   1 -
 11 files changed, 6 insertions(+), 6 deletions(-)
 rename ipxconfig-16.png => icons/ipxconfig-16.png (100%)
 rename ipxconfig-32.png => icons/ipxconfig-32.png (100%)
 rename ipxconfig.ico => icons/ipxconfig.ico (100%)
 create mode 100644 icons/ipxconfig.rc
 rename ipxrouter-16.png => icons/ipxrouter-16.png (100%)
 rename ipxrouter-32.png => icons/ipxrouter-32.png (100%)
 rename ipxrouter.ico => icons/ipxrouter.ico (100%)
 create mode 100644 icons/ipxrouter.rc
 delete mode 100644 src/ipxconfig.rc
 delete mode 100644 src/ipxrouter.rc

diff --git a/Makefile b/Makefile
index c93307e..68a94d9 100644
--- a/Makefile
+++ b/Makefile
@@ -59,13 +59,13 @@ dist: all
 ipxwrapper.dll: $(IPXWRAPPER_DEPS)
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o ipxwrapper.dll $(IPXWRAPPER_DEPS) -liphlpapi
 
-ipxconfig.exe: src/ipxconfig.cpp src/ipxconfig-rc.o
-	$(CXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -D_WIN32_IE=0x0400 -mwindows -o ipxconfig.exe src/ipxconfig.cpp src/ipxconfig-rc.o -liphlpapi -lcomctl32
+ipxconfig.exe: src/ipxconfig.cpp icons/ipxconfig.o
+	$(CXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -D_WIN32_IE=0x0400 -mwindows -o ipxconfig.exe $^ -liphlpapi -lcomctl32
 
 dpwsockx.dll: src/directplay.o src/log.o src/dpwsockx_stubs.o src/common.o
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o dpwsockx.dll src/directplay.o src/log.o src/common.o src/dpwsockx_stubs.o src/dpwsockx.def -lwsock32
 
-ipxrouter.exe: src/router-exe.o src/router.o src/interface.o src/common.o src/log.o src/ipxrouter-rc.o
+ipxrouter.exe: src/router-exe.o src/router.o src/interface.o src/common.o src/log.o icons/ipxrouter.o
 	$(CC) $(CFLAGS) -static-libgcc -mwindows -o ipxrouter.exe $^ -lws2_32 -liphlpapi
 
 src/ipxwrapper_stubs.s: src/ipxwrapper_stubs.txt
@@ -80,7 +80,7 @@ src/mswsock_stubs.s: src/mswsock_stubs.txt
 src/dpwsockx_stubs.s: src/dpwsockx_stubs.txt
 	perl mkstubs.pl src/dpwsockx_stubs.txt src/dpwsockx_stubs.s 3
 
-src/%-rc.o: src/%.rc
+icons/%.o: icons/%.rc
 	windres $< -O coff -o $@
 
 %.dll: src/stubdll.o src/%_stubs.o src/log.o src/common.o src/%.def
diff --git a/ipxconfig-16.png b/icons/ipxconfig-16.png
similarity index 100%
rename from ipxconfig-16.png
rename to icons/ipxconfig-16.png
diff --git a/ipxconfig-32.png b/icons/ipxconfig-32.png
similarity index 100%
rename from ipxconfig-32.png
rename to icons/ipxconfig-32.png
diff --git a/ipxconfig.ico b/icons/ipxconfig.ico
similarity index 100%
rename from ipxconfig.ico
rename to icons/ipxconfig.ico
diff --git a/icons/ipxconfig.rc b/icons/ipxconfig.rc
new file mode 100644
index 0000000..1f387b7
--- /dev/null
+++ b/icons/ipxconfig.rc
@@ -0,0 +1 @@
+50 ICON "ipxconfig.ico"
diff --git a/ipxrouter-16.png b/icons/ipxrouter-16.png
similarity index 100%
rename from ipxrouter-16.png
rename to icons/ipxrouter-16.png
diff --git a/ipxrouter-32.png b/icons/ipxrouter-32.png
similarity index 100%
rename from ipxrouter-32.png
rename to icons/ipxrouter-32.png
diff --git a/ipxrouter.ico b/icons/ipxrouter.ico
similarity index 100%
rename from ipxrouter.ico
rename to icons/ipxrouter.ico
diff --git a/icons/ipxrouter.rc b/icons/ipxrouter.rc
new file mode 100644
index 0000000..881f6df
--- /dev/null
+++ b/icons/ipxrouter.rc
@@ -0,0 +1 @@
+50 ICON "ipxrouter.ico"
diff --git a/src/ipxconfig.rc b/src/ipxconfig.rc
deleted file mode 100644
index a9e89ca..0000000
--- a/src/ipxconfig.rc
+++ /dev/null
@@ -1 +0,0 @@
-50 ICON "../ipxconfig.ico"
diff --git a/src/ipxrouter.rc b/src/ipxrouter.rc
deleted file mode 100644
index baa8f5f..0000000
--- a/src/ipxrouter.rc
+++ /dev/null
@@ -1 +0,0 @@
-50 ICON "../ipxrouter.ico"