diff --git a/Jupiter.sln b/Jupiter.sln
index d7352d8..dd98ab6 100644
--- a/Jupiter.sln
+++ b/Jupiter.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jupiter", "Jupiter\Jupiter.vcxproj", "{367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}"
EndProject
@@ -32,7 +32,8 @@ Global
{0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|x64.ActiveCfg = Debug|Win32
{0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|Win32.ActiveCfg = Release|Win32
{0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|Win32.Build.0 = Release|Win32
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|x64.ActiveCfg = Release|Win32
+ {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|x64.ActiveCfg = Release|x64
+ {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Jupiter/IRC_Client.h b/Jupiter/IRC_Client.h
index 1f5fa7d..e1b3f98 100644
--- a/Jupiter/IRC_Client.h
+++ b/Jupiter/IRC_Client.h
@@ -231,7 +231,7 @@ namespace Jupiter
*
* @return Number of channels.
*/
- unsigned int getChannelCount() const;
+ size_t getChannelCount() const;
User();
~User();
diff --git a/Jupiter/Jupiter.vcxproj b/Jupiter/Jupiter.vcxproj
index 9acbe91..e50b556 100644
--- a/Jupiter/Jupiter.vcxproj
+++ b/Jupiter/Jupiter.vcxproj
@@ -76,14 +76,14 @@
false
false
C:\dev\OpenSSL\Win32\include;$(IncludePath)
- C:\dev\OpenSSL\Win32\lib;$(LibraryPath)
+ C:\dev\OpenSSL\Win32\lib\VC;$(LibraryPath)
AllRules.ruleset
false
false
- C:\dev\OpenSSL\Win32\include;$(IncludePath)
- C:\dev\OpenSSL\Win32\lib;$(LibraryPath)
+ C:\dev\OpenSSL\Win64\include;$(IncludePath)
+ C:\dev\OpenSSL\Win64\lib\VC;$(LibraryPath)
AllRules.ruleset
@@ -133,6 +133,7 @@
NotSet
0.0
MachineX86
+ libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies)
@@ -164,6 +165,7 @@
true
NotSet
0.0
+ libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies)
@@ -249,10 +251,6 @@
-
-
-
-
diff --git a/Jupiter/Jupiter.vcxproj.filters b/Jupiter/Jupiter.vcxproj.filters
index bb40027..a69808f 100644
--- a/Jupiter/Jupiter.vcxproj.filters
+++ b/Jupiter/Jupiter.vcxproj.filters
@@ -275,12 +275,4 @@
Resource Files
-
-
- Resource Files
-
-
- Resource Files
-
-
\ No newline at end of file
diff --git a/Jupiter/Rehash.cpp b/Jupiter/Rehash.cpp
index 7117c68..d2bf0a9 100644
--- a/Jupiter/Rehash.cpp
+++ b/Jupiter/Rehash.cpp
@@ -121,7 +121,7 @@ bool Jupiter::removeOnRehash(int(*function)(void))
unsigned int Jupiter::removeAllOnRehash()
{
unsigned int r = rehashFunctions.size();
- while (rehashFunctions.size() != 0) delete rehashFunctions.remove(unsigned int(0));
+ while (rehashFunctions.size() != 0) delete rehashFunctions.remove(size_t{ 0 });
return r;
}
diff --git a/Jupiter/Timer.cpp b/Jupiter/Timer.cpp
index c602446..0d5b4a6 100644
--- a/Jupiter/Timer.cpp
+++ b/Jupiter/Timer.cpp
@@ -154,6 +154,6 @@ extern "C" unsigned int Jupiter_killTimers()
{
unsigned int r = timers.size();
while (timers.size() != 0)
- delete timers.remove(0U);
+ delete timers.remove(size_t{ 0 });
return r;
}
\ No newline at end of file
diff --git a/Tester/Tester.vcxproj b/Tester/Tester.vcxproj
index 93aa3d3..e4e1551 100644
--- a/Tester/Tester.vcxproj
+++ b/Tester/Tester.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{0F041791-1047-4C6A-A4C1-814E6957D5EB}
@@ -22,6 +30,12 @@
v140
Unicode
+
+ Application
+ true
+ v140
+ Unicode
+
Application
false
@@ -29,21 +43,42 @@
true
Unicode
+
+ Application
+ false
+ v140
+ true
+ Unicode
+
+
+
+
+
+
+
true
+
+ true
+
false
+ $(SolutionDir)$(Configuration)\;$(LibraryPath)
+
+
+ false
+ $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)
@@ -58,6 +93,19 @@
true
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+
+
Level3
@@ -75,14 +123,31 @@
true
true
MachineX86
+ Jupiter.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+
+
+ Full
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ ../;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ true
+ true
+ Jupiter.lib;%(AdditionalDependencies)
-
-
-
diff --git a/Tester/Tester.vcxproj.filters b/Tester/Tester.vcxproj.filters
index bc12565..9691d4a 100644
--- a/Tester/Tester.vcxproj.filters
+++ b/Tester/Tester.vcxproj.filters
@@ -19,9 +19,4 @@
Source Files
-
-
- Resource Files
-
-
\ No newline at end of file