diff --git a/projects/VS2017/examples/core_basic_window.vcxproj b/projects/VS2017/examples/core_basic_window.vcxproj
index e47eed139..044ac220c 100644
--- a/projects/VS2017/examples/core_basic_window.vcxproj
+++ b/projects/VS2017/examples/core_basic_window.vcxproj
@@ -5,18 +5,34 @@
       Debug.DLL
       Win32
     
+    
+      Debug.DLL
+      x64
+    
     
       Debug
       Win32
     
+    
+      Debug
+      x64
+    
     
       Release.DLL
       Win32
     
+    
+      Release.DLL
+      x64
+    
     
       Release
       Win32
     
+    
+      Release
+      x64
+    
   
   
     {0981CA98-E4A5-4DF1-987F-A41D09131EFC}
@@ -32,12 +48,24 @@
     $(DefaultPlatformToolset)
     Unicode
   
+  
+    Application
+    true
+    $(DefaultPlatformToolset)
+    Unicode
+  
   
     Application
     true
     $(DefaultPlatformToolset)
     Unicode
   
+  
+    Application
+    true
+    $(DefaultPlatformToolset)
+    Unicode
+  
   
     Application
     false
@@ -45,6 +73,13 @@
     true
     Unicode
   
+  
+    Application
+    false
+    $(DefaultPlatformToolset)
+    true
+    Unicode
+  
   
     Application
     false
@@ -52,6 +87,13 @@
     true
     Unicode
   
+  
+    Application
+    false
+    $(DefaultPlatformToolset)
+    true
+    Unicode
+  
   
   
   
@@ -60,36 +102,60 @@
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
   
     true
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
+    true
+  
   
     true
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
+    true
+  
   
     false
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
+    false
+  
   
     false
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
+    false
+  
   
     
       
@@ -107,6 +173,23 @@
       kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
     
   
+  
+    
+      
+      
+      Level3
+      Disabled
+      WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)
+      CompileAsC
+      $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+    
+    
+      Console
+      true
+      %(AdditionalLibraryDirectories)
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+    
+  
   
     
       
@@ -124,6 +207,23 @@
       kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
     
   
+  
+    
+      
+      
+      Level3
+      Disabled
+      WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)
+      CompileAsC
+      $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+    
+    
+      Console
+      true
+      %(AdditionalLibraryDirectories)
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+    
+  
   
     
       Level3
@@ -146,6 +246,28 @@
       %(AdditionalLibraryDirectories)
     
   
+  
+    
+      Level3
+      
+      
+      MaxSpeed
+      true
+      true
+      WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP
+      $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+      CompileAsC
+      true
+    
+    
+      Console
+      true
+      true
+      true
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+      %(AdditionalLibraryDirectories)
+    
+  
   
     
       Level3
@@ -168,6 +290,28 @@
       %(AdditionalLibraryDirectories)
     
   
+  
+    
+      Level3
+      
+      
+      MaxSpeed
+      true
+      true
+      WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP
+      $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+      CompileAsC
+      true
+    
+    
+      Console
+      true
+      true
+      true
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+      %(AdditionalLibraryDirectories)
+    
+  
   
     
   
diff --git a/projects/VS2017/examples/core_basic_window_cpp.vcxproj b/projects/VS2017/examples/core_basic_window_cpp.vcxproj
index baf0f798b..524f119e9 100644
--- a/projects/VS2017/examples/core_basic_window_cpp.vcxproj
+++ b/projects/VS2017/examples/core_basic_window_cpp.vcxproj
@@ -5,18 +5,34 @@
       Debug.DLL
       Win32
     
+    
+      Debug.DLL
+      x64
+    
     
       Debug
       Win32
     
+    
+      Debug
+      x64
+    
     
       Release.DLL
       Win32
     
+    
+      Release.DLL
+      x64
+    
     
       Release
       Win32
     
+    
+      Release
+      x64
+    
   
   
     {B655E850-3322-42F7-941D-6AC18FD66CA1}
@@ -32,12 +48,24 @@
     $(DefaultPlatformToolset)
     Unicode
   
+  
+    Application
+    true
+    $(DefaultPlatformToolset)
+    Unicode
+  
   
     Application
     true
     $(DefaultPlatformToolset)
     Unicode
   
+  
+    Application
+    true
+    $(DefaultPlatformToolset)
+    Unicode
+  
   
     Application
     false
@@ -45,6 +73,13 @@
     true
     Unicode
   
+  
+    Application
+    false
+    $(DefaultPlatformToolset)
+    true
+    Unicode
+  
   
     Application
     false
@@ -52,6 +87,13 @@
     true
     Unicode
   
+  
+    Application
+    false
+    $(DefaultPlatformToolset)
+    true
+    Unicode
+  
   
   
   
@@ -60,36 +102,60 @@
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
   
     true
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
+    true
+  
   
     true
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
+    true
+  
   
     false
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
+    false
+  
   
     false
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
+    false
+  
   
     
       
@@ -107,6 +173,23 @@
       %(AdditionalLibraryDirectories)
     
   
+  
+    
+      
+      
+      Level3
+      Disabled
+      WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+      $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+      CompileAsCpp
+    
+    
+      Console
+      true
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+      %(AdditionalLibraryDirectories)
+    
+  
   
     
       
@@ -124,6 +207,23 @@
       %(AdditionalLibraryDirectories)
     
   
+  
+    
+      
+      
+      Level3
+      Disabled
+      WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+      $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+      CompileAsCpp
+    
+    
+      Console
+      true
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+      %(AdditionalLibraryDirectories)
+    
+  
   
     
       Level3
@@ -145,6 +245,27 @@
       kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
     
   
+  
+    
+      Level3
+      
+      
+      MaxSpeed
+      true
+      true
+      WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+      CompileAsCpp
+      $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+    
+    
+      Console
+      true
+      true
+      true
+      %(AdditionalLibraryDirectories)
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+    
+  
   
     
       Level3
@@ -166,6 +287,27 @@
       kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
     
   
+  
+    
+      Level3
+      
+      
+      MaxSpeed
+      true
+      true
+      WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+      CompileAsCpp
+      $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+    
+    
+      Console
+      true
+      true
+      true
+      %(AdditionalLibraryDirectories)
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+    
+  
   
     
       {e89d61ac-55de-4482-afd4-df7242ebc859}
diff --git a/projects/VS2017/raylib.sln b/projects/VS2017/raylib.sln
index f163b7b70..8fab7aefb 100644
--- a/projects/VS2017/raylib.sln
+++ b/projects/VS2017/raylib.sln
@@ -13,34 +13,62 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{87
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug.DLL|x64 = Debug.DLL|x64
 		Debug.DLL|x86 = Debug.DLL|x86
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release.DLL|x64 = Release.DLL|x64
 		Release.DLL|x86 = Release.DLL|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64
+		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Debug.DLL|x64.Build.0 = Debug.DLL|x64
 		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32
 		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32
+		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Debug|x64.ActiveCfg = Debug|x64
+		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Debug|x64.Build.0 = Debug|x64
 		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Debug|x86.ActiveCfg = Debug|Win32
 		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Debug|x86.Build.0 = Debug|Win32
+		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Release.DLL|x64.ActiveCfg = Release.DLL|x64
+		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Release.DLL|x64.Build.0 = Release.DLL|x64
 		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32
 		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Release.DLL|x86.Build.0 = Release.DLL|Win32
+		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Release|x64.ActiveCfg = Release|x64
+		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Release|x64.Build.0 = Release|x64
 		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Release|x86.ActiveCfg = Release|Win32
 		{0981CA98-E4A5-4DF1-987F-A41D09131EFC}.Release|x86.Build.0 = Release|Win32
+		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64
+		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Debug.DLL|x64.Build.0 = Debug.DLL|x64
 		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32
 		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32
+		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Debug|x64.ActiveCfg = Debug|x64
+		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Debug|x64.Build.0 = Debug|x64
 		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Debug|x86.ActiveCfg = Debug|Win32
 		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Debug|x86.Build.0 = Debug|Win32
+		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Release.DLL|x64.ActiveCfg = Release.DLL|x64
+		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Release.DLL|x64.Build.0 = Release.DLL|x64
 		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32
 		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Release.DLL|x86.Build.0 = Release.DLL|Win32
+		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Release|x64.ActiveCfg = Release|x64
+		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Release|x64.Build.0 = Release|x64
 		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Release|x86.ActiveCfg = Release|Win32
 		{E89D61AC-55DE-4482-AFD4-DF7242EBC859}.Release|x86.Build.0 = Release|Win32
+		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64
+		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Debug.DLL|x64.Build.0 = Debug.DLL|x64
 		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32
 		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32
+		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Debug|x64.ActiveCfg = Debug|x64
+		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Debug|x64.Build.0 = Debug|x64
 		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Debug|x86.ActiveCfg = Debug|Win32
 		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Debug|x86.Build.0 = Debug|Win32
+		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Release.DLL|x64.ActiveCfg = Release.DLL|x64
+		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Release.DLL|x64.Build.0 = Release.DLL|x64
 		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32
 		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Release.DLL|x86.Build.0 = Release.DLL|Win32
+		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Release|x64.ActiveCfg = Release|x64
+		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Release|x64.Build.0 = Release|x64
 		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Release|x86.ActiveCfg = Release|Win32
 		{B655E850-3322-42F7-941D-6AC18FD66CA1}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
diff --git a/projects/VS2017/raylib/raylib.vcxproj b/projects/VS2017/raylib/raylib.vcxproj
index 2bdf97db3..89b8bf100 100644
--- a/projects/VS2017/raylib/raylib.vcxproj
+++ b/projects/VS2017/raylib/raylib.vcxproj
@@ -5,18 +5,34 @@
       Debug.DLL
       Win32
     
+    
+      Debug.DLL
+      x64
+    
     
       Debug
       Win32
     
+    
+      Debug
+      x64
+    
     
       Release.DLL
       Win32
     
+    
+      Release.DLL
+      x64
+    
     
       Release
       Win32
     
+    
+      Release
+      x64
+    
   
   
     {E89D61AC-55DE-4482-AFD4-DF7242EBC859}
@@ -31,12 +47,24 @@
     $(DefaultPlatformToolset)
     Unicode
   
+  
+    StaticLibrary
+    true
+    $(DefaultPlatformToolset)
+    Unicode
+  
   
     DynamicLibrary
     true
     $(DefaultPlatformToolset)
     Unicode
   
+  
+    DynamicLibrary
+    true
+    $(DefaultPlatformToolset)
+    Unicode
+  
   
     StaticLibrary
     false
@@ -44,6 +72,13 @@
     true
     Unicode
   
+  
+    StaticLibrary
+    false
+    $(DefaultPlatformToolset)
+    true
+    Unicode
+  
   
     DynamicLibrary
     false
@@ -51,6 +86,13 @@
     true
     Unicode
   
+  
+    DynamicLibrary
+    false
+    $(DefaultPlatformToolset)
+    true
+    Unicode
+  
   
   
   
@@ -59,20 +101,33 @@
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
     
   
+  
+    
+  
   
   
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
   
+  
   
     $(SolutionDir)\bin\$(Configuration)\
     $(SolutionDir)\obj\$(Configuration)\
@@ -102,6 +157,23 @@
       %(AdditionalLibraryDirectories)
     
   
+  
+    
+      
+      
+      Level3
+      Disabled
+      WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);GRAPHICS_API_OPENGL_33;PLATFORM_DESKTOP
+      CompileAsC
+      $(SolutionDir)..\..\release\include;$(SolutionDir)..\..\src\external\glfw\include
+    
+    
+      Windows
+    
+    
+      %(AdditionalLibraryDirectories)
+    
+  
   
     
       
@@ -121,6 +193,25 @@
       %(AdditionalLibraryDirectories)
     
   
+  
+    
+      
+      
+      Level3
+      Disabled
+      WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);GRAPHICS_API_OPENGL_33;PLATFORM_DESKTOP;BUILD_LIBTYPE_SHARED
+      CompileAsC
+      $(SolutionDir)..\..\release\include;$(SolutionDir)..\..\src\external\glfw\include
+      MultiThreadedDebug
+    
+    
+      Windows
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+    
+    
+      %(AdditionalLibraryDirectories)
+    
+  
   
     
       Level3
@@ -139,6 +230,24 @@
       true
     
   
+  
+    
+      Level3
+      
+      
+      MaxSpeed
+      true
+      true
+      WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);GRAPHICS_API_OPENGL_33;PLATFORM_DESKTOP
+      $(SolutionDir)..\..\release\include;$(SolutionDir)..\..\src\external\glfw\include
+      CompileAsC
+    
+    
+      Windows
+      true
+      true
+    
+  
   
     
       Level3
@@ -159,6 +268,26 @@
       kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
     
   
+  
+    
+      Level3
+      
+      
+      MaxSpeed
+      true
+      true
+      WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);GRAPHICS_API_OPENGL_33;PLATFORM_DESKTOP;BUILD_LIBTYPE_SHARED
+      $(SolutionDir)..\..\release\include;$(SolutionDir)..\..\src\external\glfw\include
+      CompileAsC
+      MultiThreaded
+    
+    
+      Windows
+      true
+      true
+      kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+    
+