diff --git a/.gitignore b/.gitignore
index 997603bbb..e76177fe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,10 @@
/polymer/eduke32/*.sdf
/polymer/eduke32/*.suo
/polymer/eduke32/*.opensdf
+/polymer/eduke32/.vs
+/polymer/eduke32/*.vcxproj.user
+/polymer/eduke32/*.psess
+/polymer/eduke32/*.vsp
/polymer/eduke32/*.elf
/polymer/eduke32/*.dol
/polymer/eduke32/*.x86
@@ -34,4 +38,6 @@
/polymer/eduke32/source/sw/obj
xcuserdata
project.xcworkspace
-.DS_Store
+.DS_Store
+/polymer/eduke32/*.cache
+/polymer/eduke32/*.cfg
diff --git a/polymer/eduke32/eduke32.sln b/polymer/eduke32/eduke32.sln
index 2488e0adf..86eb7bbc1 100644
--- a/polymer/eduke32/eduke32.sln
+++ b/polymer/eduke32/eduke32.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.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eduke32", "eduke32.vcxproj", "{8E7A6179-0B72-4073-8A4C-E8682D481DAE}"
EndProject
diff --git a/polymer/eduke32/eduke32.vcxproj b/polymer/eduke32/eduke32.vcxproj
index 6c596d004..f32e5bd66 100644
--- a/polymer/eduke32/eduke32.vcxproj
+++ b/polymer/eduke32/eduke32.vcxproj
@@ -40,204 +40,53 @@
MakeFileProj
-
- Makefile
- v110
-
-
- Makefile
- v110
-
-
- Makefile
-
-
- Makefile
-
-
- Makefile
- v110
-
-
- Makefile
- v110
-
-
- Makefile
-
-
- Makefile
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
<_ProjectFileVersion>10.0.30319.1
- $(Configuration)\
- $(Configuration)\
+ Makefile
+ v140
+ .\
+ .\
+ $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include
nmake /f Makefile.msvc DEBUG=1 WINBITS=32
nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=32
- nmake /f Makefile.msvc veryclean WINBITS=32
- eduke32.exe
+ nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=32
USE_OPENGL;POLYMER
- $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(Configuration)\
- $(Configuration)\
nmake /f Makefile.msvc WINBITS=32
nmake /f Makefile.msvc veryclean all WINBITS=32
nmake /f Makefile.msvc veryclean WINBITS=32
- eduke32.exe
USE_OPENGL;POLYMER
- $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(SourcePath)
- $(Configuration)\
- $(Configuration)\
nmake /f Makefile.msvc DEBUG=1 WINBITS=64
nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=64
- nmake /f Makefile.msvc veryclean WINBITS=64
- eduke32.exe
+ nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=64
USE_OPENGL;POLYMER;NOASM
- $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(Configuration)\
- $(Configuration)\
nmake /f Makefile.msvc WINBITS=64
nmake /f Makefile.msvc veryclean all WINBITS=64
nmake /f Makefile.msvc veryclean WINBITS=64
- eduke32.exe
USE_OPENGL;POLYMER;NOASM
- $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(Configuration)\
- $(Configuration)\
nmake /f Makefile.msvc DEBUG=1 WINBITS=32 RENDERTYPE=SDL
nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=32 RENDERTYPE=SDL
- nmake /f Makefile.msvc veryclean WINBITS=32 RENDERTYPE=SDL
- eduke32.exe
+ nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=32 RENDERTYPE=SDL
USE_OPENGL;POLYMER
- $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(Configuration)\
- $(Configuration)\
nmake /f Makefile.msvc WINBITS=32 RENDERTYPE=SDL
nmake /f Makefile.msvc veryclean all WINBITS=32 RENDERTYPE=SDL
nmake /f Makefile.msvc veryclean WINBITS=32 RENDERTYPE=SDL
- eduke32.exe
USE_OPENGL;POLYMER
- $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(SourcePath)
- $(Configuration)\
- $(Configuration)\
nmake /f Makefile.msvc DEBUG=1 WINBITS=64 RENDERTYPE=SDL
nmake /f Makefile.msvc veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL
- nmake /f Makefile.msvc veryclean WINBITS=64 RENDERTYPE=SDL
- eduke32.exe
+ nmake /f Makefile.msvc veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL
USE_OPENGL;POLYMER;NOASM;HAVE_INTTYPES
- $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(Configuration)\
- $(Configuration)\
nmake /f Makefile.msvc WINBITS=64 RENDERTYPE=SDL
nmake /f Makefile.msvc veryclean all WINBITS=64 RENDERTYPE=SDL
nmake /f Makefile.msvc veryclean WINBITS=64 RENDERTYPE=SDL
- eduke32.exe
USE_OPENGL;POLYMER;NOASM
- $(NMakeIncludeSearchPath);build\include;source\jmact;source\jaudiolib\include;source\enet\include;
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- $(SourcePath)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-