diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index 2a6ee04f4..14b40e255 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -208,7 +208,7 @@ endif
 # compiler flags etc.
 BASECFLAGS= -Wno-attributes
 BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement
-BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive
+BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing
 BASEASFLAGS=-s #-g
 BASELDFLAGS=
 
diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc
index 3aa4c8617..da401019a 100644
--- a/polymer/eduke32/Makefile.msvc
+++ b/polymer/eduke32/Makefile.msvc
@@ -1,5 +1,5 @@
 # EDuke32 Makefile for Microsoft NMake
-
+CPLUSPLUS=1
 SRC=source
 OBJ=obj_win
 EROOT=build
@@ -25,16 +25,20 @@ DXROOT="H:\Microsoft DirectX SDK (February 2010)"
 
 !ifdef DEBUG
 # debugging options
-flags_cl= /Od /Zi
+flags_cl=/Od /Zi
 flags_link=/DEBUG
 !else
 # release options
-flags_cl=/O2 /GL /arch:SSE /MP /I$(WDKROOT)\inc\crt
-flags_link=/RELEASE /LTCG /LIBPATH:$(WDKROOT)\lib\wxp\i386 /LIBPATH:$(WDKROOT)\lib\Crt\i386
+flags_cl=/O2 /GL /arch:SSE /MP # /I$(WDKROOT)\inc\crt /I$(WDKROOT)\inc\api
+flags_link=/RELEASE /LTCG # /LIBPATH:$(WDKROOT)\lib\wxp\i386 /LIBPATH:$(WDKROOT)\lib\Crt\i386
 !endif
 
 ENGINEOPTS=/DUSE_OPENGL /DPOLYMER 
 
+!ifdef CPLUSPLUS
+ENGINEOPTS=$(ENGINEOPTS) /TP
+!endif
+
 CC=cl
 AS=ml
 LINK=link /nologo /opt:ref 
@@ -57,7 +61,7 @@ CFLAGS=$(CFLAGS) /DDEBUGGINGAIDS /D "_CRT_SECURE_NO_DEPRECATE"
 LIBS=$(LIBS)  msvcrtd.lib
 !else
 # comment msvcrt_winxp.obj if not using the WDK
-LIBS=$(LIBS)  msvcrt.lib msvcrt_winxp.obj
+LIBS=$(LIBS)  msvcrt.lib # msvcrt_winxp.obj
 !endif
 
 JMACTOBJ=$(OBJ)\file_lib.$o \
@@ -71,7 +75,9 @@ JMACTOBJ=$(OBJ)\file_lib.$o \
 AUDIOLIBOBJ=$(OBJ)\midi.$o $(OBJ)\music.$o $(OBJ)\mpu401.$o
  
 GAMEOBJS=$(OBJ)\game.$o \
+	$(OBJ)\game_inline.$o \
 	$(OBJ)\actors.$o \
+	$(OBJ)\actors_inline.$o \
 	$(OBJ)\anim.$o \
 	$(OBJ)\common.$o \
 	$(OBJ)\demo.$o \
@@ -87,6 +93,7 @@ GAMEOBJS=$(OBJ)\game.$o \
 	$(OBJ)\premap.$o \
 	$(OBJ)\savegame.$o \
 	$(OBJ)\sector.$o \
+	$(OBJ)\sector_inline.$o \
 	$(OBJ)\rts.$o \
 	$(OBJ)\config.$o \
 	$(OBJ)\animlib.$o\
diff --git a/polymer/eduke32/build/Makefile.msvc b/polymer/eduke32/build/Makefile.msvc
index 6809462bd..c5dd79217 100644
--- a/polymer/eduke32/build/Makefile.msvc
+++ b/polymer/eduke32/build/Makefile.msvc
@@ -35,8 +35,8 @@ flags_link=/DEBUG
 flags_lib=
 !else
 # release options
-flags_cl=/O2 /GL /arch:SSE /MP /I$(WDKROOT)\inc\crt
-flags_link=/RELEASE /LTCG /LIBPATH:$(WDKROOT)\lib\Crt\i386 /LIBPATH:$(WDKROOT)\lib\wxp\i386
+flags_cl=/O2 /GL /arch:SSE /MP # /I$(WDKROOT)\inc\crt
+flags_link=/RELEASE /LTCG # /LIBPATH:$(WDKROOT)\lib\Crt\i386 /LIBPATH:$(WDKROOT)\lib\wxp\i386
 flags_lib=/LTCG
 !endif
 
@@ -45,7 +45,7 @@ AS=ml
 RC=rc
 LINK=link /opt:ref /nologo
 CFLAGS=$(CFLAGS) /nologo /MT /J $(flags_cl) $(TARGETOPTS) /I$(INC)
-ASFLAGS=/nologo /coff /c
+ASFLAGS=/nologo /coff /c 
 EXESUFFIX=.exe
 !ifdef DEBUG
 CFLAGS=$(CFLAGS) /DDEBUGGINGAIDS /D "_CRT_SECURE_NO_DEPRECATE"
diff --git a/polymer/eduke32/eduke32.vcxproj b/polymer/eduke32/eduke32.vcxproj
index 572194708..30e08fbbb 100644
--- a/polymer/eduke32/eduke32.vcxproj
+++ b/polymer/eduke32/eduke32.vcxproj
@@ -104,12 +104,16 @@
     <ClInclude Include="build\include\scriptfile.h" />
     <ClInclude Include="build\include\sdlayer.h" />
     <ClInclude Include="build\include\startwin.editor.h" />
+    <ClInclude Include="build\include\tracker.hpp" />
+    <ClInclude Include="build\include\tracker_operator.hpp" />
+    <ClInclude Include="build\include\tracker_operators.hpp" />
     <ClInclude Include="build\include\winlayer.h" />
     <ClInclude Include="build\include\msvc\inttypes.h" />
     <ClInclude Include="build\include\msvc\stdint.h" />
     <ClInclude Include="build\src\engine_priv.h" />
     <ClInclude Include="source\actors.h" />
     <ClInclude Include="source\anim.h" />
+    <ClInclude Include="source\animvpx.h" />
     <ClInclude Include="source\demo.h" />
     <ClInclude Include="source\game.h" />
     <ClInclude Include="source\gameexec.h" />
@@ -215,9 +219,11 @@
     <ClCompile Include="build\src\winlayer.c" />
     <ClCompile Include="source\actors.c" />
     <ClCompile Include="source\anim.c" />
+    <ClCompile Include="source\animvpx.c" />
     <ClCompile Include="source\astub.c" />
     <ClCompile Include="source\config.c" />
     <ClCompile Include="source\demo.c" />
+    <ClCompile Include="source\enet\src\compress.c" />
     <ClCompile Include="source\game.c" />
     <ClCompile Include="source\gamedef.c" />
     <ClCompile Include="source\gameexec.c" />
@@ -285,4 +291,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/polymer/eduke32/eduke32.vcxproj.filters b/polymer/eduke32/eduke32.vcxproj.filters
index ee41839af..fe0a9c290 100644
--- a/polymer/eduke32/eduke32.vcxproj.filters
+++ b/polymer/eduke32/eduke32.vcxproj.filters
@@ -390,6 +390,18 @@
     <ClInclude Include="source\input.h">
       <Filter>eduke32\headers</Filter>
     </ClInclude>
+    <ClInclude Include="build\include\tracker_operator.hpp">
+      <Filter>build\headers</Filter>
+    </ClInclude>
+    <ClInclude Include="build\include\tracker_operators.hpp">
+      <Filter>build\headers</Filter>
+    </ClInclude>
+    <ClInclude Include="build\include\tracker.hpp">
+      <Filter>build\headers</Filter>
+    </ClInclude>
+    <ClInclude Include="source\animvpx.h">
+      <Filter>eduke32\headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="build\src\a-c.c">
@@ -677,6 +689,12 @@
     <ClCompile Include="source\input.c">
       <Filter>eduke32\source</Filter>
     </ClCompile>
+    <ClCompile Include="source\animvpx.c">
+      <Filter>eduke32\source</Filter>
+    </ClCompile>
+    <ClCompile Include="source\enet\src\compress.c">
+      <Filter>enet\source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.msvc">
@@ -686,4 +704,4 @@
       <Filter>build</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file