summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--VC2008/MCServer.vcproj8
-rw-r--r--VC2013/MCServer.rc17
-rw-r--r--VC2013/MCServer.vcxproj6
-rw-r--r--VC2013/icon.icobin353118 -> 0 bytes
-rw-r--r--VC2013/resource_MCServer.h5
-rw-r--r--src/Resources/MCServer.rc (renamed from VC2008/MCServer.rc)0
-rw-r--r--src/Resources/icon.ico (renamed from VC2008/icon.ico)bin353118 -> 353118 bytes
-rw-r--r--src/Resources/icon_128.png (renamed from VC2008/icon_128.png)bin26758 -> 26758 bytes
-rw-r--r--src/Resources/icon_256.png (renamed from VC2008/icon_256.png)bin66137 -> 66137 bytes
-rw-r--r--src/Resources/resource_MCServer.h (renamed from VC2008/resource_MCServer.h)0
10 files changed, 7 insertions, 29 deletions
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/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
--- a/VC2013/icon.ico
+++ /dev/null
Binary files 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/VC2008/MCServer.rc b/src/Resources/MCServer.rc
index e0fbbea5d..e0fbbea5d 100644
--- a/VC2008/MCServer.rc
+++ b/src/Resources/MCServer.rc
diff --git a/VC2008/icon.ico b/src/Resources/icon.ico
index 4024523a1..4024523a1 100644
--- a/VC2008/icon.ico
+++ b/src/Resources/icon.ico
Binary files differ
diff --git a/VC2008/icon_128.png b/src/Resources/icon_128.png
index 87d939a04..87d939a04 100644
--- a/VC2008/icon_128.png
+++ b/src/Resources/icon_128.png
Binary files differ
diff --git a/VC2008/icon_256.png b/src/Resources/icon_256.png
index 9a77a490f..9a77a490f 100644
--- a/VC2008/icon_256.png
+++ b/src/Resources/icon_256.png
Binary files differ
diff --git a/VC2008/resource_MCServer.h b/src/Resources/resource_MCServer.h
index 42f6c4eaf..42f6c4eaf 100644
--- a/VC2008/resource_MCServer.h
+++ b/src/Resources/resource_MCServer.h