From 118b7a121b5c50d52be2e2dcffec13be505426db Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sun, 12 Jan 2014 17:57:29 +0100
Subject: Moved the win resources into a separate subfolder.

This will allow us to use them in CMake builds.
---
 VC2008/MCServer.rc                |  17 -----------------
 VC2008/MCServer.vcproj            |   8 ++++----
 VC2008/icon.ico                   | Bin 353118 -> 0 bytes
 VC2008/icon_128.png               | Bin 26758 -> 0 bytes
 VC2008/icon_256.png               | Bin 66137 -> 0 bytes
 VC2008/resource_MCServer.h        |   5 -----
 VC2013/MCServer.rc                |  17 -----------------
 VC2013/MCServer.vcxproj           |   6 +++---
 VC2013/icon.ico                   | Bin 353118 -> 0 bytes
 VC2013/resource_MCServer.h        |   5 -----
 src/Resources/MCServer.rc         |  17 +++++++++++++++++
 src/Resources/icon.ico            | Bin 0 -> 353118 bytes
 src/Resources/icon_128.png        | Bin 0 -> 26758 bytes
 src/Resources/icon_256.png        | Bin 0 -> 66137 bytes
 src/Resources/resource_MCServer.h |   5 +++++
 15 files changed, 29 insertions(+), 51 deletions(-)
 delete mode 100644 VC2008/MCServer.rc
 delete mode 100644 VC2008/icon.ico
 delete mode 100644 VC2008/icon_128.png
 delete mode 100644 VC2008/icon_256.png
 delete mode 100644 VC2008/resource_MCServer.h
 delete mode 100644 VC2013/MCServer.rc
 delete mode 100644 VC2013/icon.ico
 delete mode 100644 VC2013/resource_MCServer.h
 create mode 100644 src/Resources/MCServer.rc
 create mode 100644 src/Resources/icon.ico
 create mode 100644 src/Resources/icon_128.png
 create mode 100644 src/Resources/icon_256.png
 create mode 100644 src/Resources/resource_MCServer.h

diff --git a/VC2008/MCServer.rc b/VC2008/MCServer.rc
deleted file mode 100644
index e0fbbea5d..000000000
--- a/VC2008/MCServer.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ResEdit 1.5.11
-// Copyright (C) 2006-2012
-// http://www.resedit.net
-
-#include <windows.h>
-#include <commctrl.h>
-#include <richedit.h>
-#include "resource_MCServer.h"
-
-
-
-
-//
-// Icon resources
-//
-LANGUAGE 9, SUBLANG_DEFAULT
-IDI_ICON1          ICON           "icon.ico"
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index f835819a6..0927f2f7b 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="MCServer"
 	ProjectGUID="{32012054-0C96-4C43-AB27-174FF8E72D66}"
 	RootNamespace="MCServer"
@@ -413,15 +413,15 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\icon.ico"
+				RelativePath="..\src\Resources\icon.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\MCServer.rc"
+				RelativePath="..\src\Resources\MCServer.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\resource_MCServer.h"
+				RelativePath="..\src\Resources\resource_MCServer.h"
 				>
 			</File>
 			<File
diff --git a/VC2008/icon.ico b/VC2008/icon.ico
deleted file mode 100644
index 4024523a1..000000000
Binary files a/VC2008/icon.ico and /dev/null differ
diff --git a/VC2008/icon_128.png b/VC2008/icon_128.png
deleted file mode 100644
index 87d939a04..000000000
Binary files a/VC2008/icon_128.png and /dev/null differ
diff --git a/VC2008/icon_256.png b/VC2008/icon_256.png
deleted file mode 100644
index 9a77a490f..000000000
Binary files a/VC2008/icon_256.png and /dev/null differ
diff --git a/VC2008/resource_MCServer.h b/VC2008/resource_MCServer.h
deleted file mode 100644
index 42f6c4eaf..000000000
--- a/VC2008/resource_MCServer.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1)
-#endif
-
-#define IDI_ICON1                               101
diff --git a/VC2013/MCServer.rc b/VC2013/MCServer.rc
deleted file mode 100644
index e0fbbea5d..000000000
--- a/VC2013/MCServer.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ResEdit 1.5.11
-// Copyright (C) 2006-2012
-// http://www.resedit.net
-
-#include <windows.h>
-#include <commctrl.h>
-#include <richedit.h>
-#include "resource_MCServer.h"
-
-
-
-
-//
-// Icon resources
-//
-LANGUAGE 9, SUBLANG_DEFAULT
-IDI_ICON1          ICON           "icon.ico"
diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj
index d52c16323..95b73ae57 100644
--- a/VC2013/MCServer.vcxproj
+++ b/VC2013/MCServer.vcxproj
@@ -218,13 +218,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Image Include="icon.ico" />
+    <Image Include="..\src\Resources\icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="MCServer.rc" />
+    <ResourceCompile Include="..\src\Resources\MCServer.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource_MCServer.h" />
+    <ClInclude Include="..\src\Resources\resource_MCServer.h" />
     <ClInclude Include="..\src\Authenticator.h" />
     <ClInclude Include="..\src\BlockArea.h" />
     <ClInclude Include="..\src\BlockID.h" />
diff --git a/VC2013/icon.ico b/VC2013/icon.ico
deleted file mode 100644
index 4024523a1..000000000
Binary files a/VC2013/icon.ico and /dev/null differ
diff --git a/VC2013/resource_MCServer.h b/VC2013/resource_MCServer.h
deleted file mode 100644
index 42f6c4eaf..000000000
--- a/VC2013/resource_MCServer.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1)
-#endif
-
-#define IDI_ICON1                               101
diff --git a/src/Resources/MCServer.rc b/src/Resources/MCServer.rc
new file mode 100644
index 000000000..e0fbbea5d
--- /dev/null
+++ b/src/Resources/MCServer.rc
@@ -0,0 +1,17 @@
+// Generated by ResEdit 1.5.11
+// Copyright (C) 2006-2012
+// http://www.resedit.net
+
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include "resource_MCServer.h"
+
+
+
+
+//
+// Icon resources
+//
+LANGUAGE 9, SUBLANG_DEFAULT
+IDI_ICON1          ICON           "icon.ico"
diff --git a/src/Resources/icon.ico b/src/Resources/icon.ico
new file mode 100644
index 000000000..4024523a1
Binary files /dev/null and b/src/Resources/icon.ico differ
diff --git a/src/Resources/icon_128.png b/src/Resources/icon_128.png
new file mode 100644
index 000000000..87d939a04
Binary files /dev/null and b/src/Resources/icon_128.png differ
diff --git a/src/Resources/icon_256.png b/src/Resources/icon_256.png
new file mode 100644
index 000000000..9a77a490f
Binary files /dev/null and b/src/Resources/icon_256.png differ
diff --git a/src/Resources/resource_MCServer.h b/src/Resources/resource_MCServer.h
new file mode 100644
index 000000000..42f6c4eaf
--- /dev/null
+++ b/src/Resources/resource_MCServer.h
@@ -0,0 +1,5 @@
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+
+#define IDI_ICON1                               101
-- 
cgit v1.2.3