Merge pull request #877 from QW-Group/mvdsv-sync

Sync mvdsv and ezquake so KTX could be able to run with ezquake as server + client

Makefile

@@ -223,7 +223,6 @@ SERVER_OBJS := \
     $(SRC_DIR)/pr2_cmds.o \
     $(SRC_DIR)/pr2_edict.o \
     $(SRC_DIR)/pr2_exec.o \
-    $(SRC_DIR)/pr2_vm.o \
     $(SRC_DIR)/sv_ccmds.o \
     $(SRC_DIR)/sv_ents.o \
     $(SRC_DIR)/sv_init.o \
@@ -240,7 +239,10 @@ SERVER_OBJS := \
     $(SRC_DIR)/sv_demo_misc.o \
     $(SRC_DIR)/sv_demo_qtv.o \
     $(SRC_DIR)/sv_login.o \
-    $(SRC_DIR)/sv_mod_frags.o
+    $(SRC_DIR)/sv_mod_frags.o \
+    $(SRC_DIR)/vm.o \
+    $(SRC_DIR)/vm_interpreted.o \
+    $(SRC_DIR)/vm_x86.o
 
 HELP_OBJS := \
     $(patsubst help_%.json,help_%.o,$(wildcard help_*.json))

ezQuake.vcxproj

@@ -2133,9 +2133,6 @@ msversion.bat</Command>
     <ClCompile Include="src\pr2_exec.c">
       <FileType>CppCode</FileType>
     </ClCompile>
-    <ClCompile Include="src\pr2_vm.c">
-      <FileType>CppCode</FileType>
-    </ClCompile>
     <ClCompile Include="src\pr_cmds.c">
       <FileType>CppCode</FileType>
     </ClCompile>
@@ -2145,6 +2142,9 @@ msversion.bat</Command>
     <ClCompile Include="src\pr_exec.c">
       <FileType>CppCode</FileType>
     </ClCompile>
+    <ClCompile Include="src\vm.c" />
+    <ClCompile Include="src\vm_interpreted.c" />
+    <ClCompile Include="src\vm_x86.c" />
     <ClCompile Include="src\qtv.c" />
     <ClCompile Include="src\q_shared.c" />
     <ClCompile Include="src\rulesets.c" />
@@ -2950,6 +2950,7 @@ msversion.bat</Command>
     <ClInclude Include="src\cmd.h" />
     <ClInclude Include="src\cmodel.h" />
     <ClInclude Include="src\common.h" />
+    <ClInclude Include="src\q_platform.h" />
     <ClInclude Include="src\common_draw.h" />
     <ClInclude Include="src\config_manager.h" />
     <ClInclude Include="src\console.h" />
@@ -3015,8 +3016,9 @@ msversion.bat</Command>
     <ClInclude Include="src\parser.h" />
     <ClInclude Include="src\particles_classic.h" />
     <ClInclude Include="src\pmove.h" />
+    <ClInclude Include="src\vm.h" />
+    <ClInclude Include="src\vm_local.h" />
     <ClInclude Include="src\pr2.h" />
-    <ClInclude Include="src\pr2_vm.h" />
     <ClInclude Include="src\progdefs.h" />
     <ClInclude Include="src\progs.h" />
     <ClInclude Include="src\pr_comp.h" />

ezQuake.vcxproj.filters

@@ -407,9 +407,6 @@
     <ClCompile Include="src\help.c">
       <Filter>Source Files\Documentation</Filter>
     </ClCompile>
-    <ClCompile Include="src\pr2_vm.c">
-      <Filter>Source Files\Server</Filter>
-    </ClCompile>
     <ClCompile Include="src\pr_cmds.c">
       <Filter>Source Files\Server</Filter>
     </ClCompile>
@@ -428,6 +425,15 @@
     <ClCompile Include="src\pr2_exec.c">
       <Filter>Source Files\Server</Filter>
     </ClCompile>
+    <ClCompile Include="src\vm.c">
+      <Filter>Source Files\Server</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vm_interpreted.c">
+      <Filter>Source Files\Server</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vm_x86.c">
+      <Filter>Source Files\Server</Filter>
+    </ClCompile>
     <ClCompile Include="src\Ctrl.c">
       <Filter>Source Files\UserInterface</Filter>
     </ClCompile>
@@ -1231,6 +1237,9 @@
     <ClInclude Include="src\common.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\q_platform.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\common_draw.h">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -1381,10 +1390,13 @@
     <ClInclude Include="src\pr_comp.h">
       <Filter>Source Files\Server</Filter>
     </ClInclude>
-    <ClInclude Include="src\pr2.h">
+    <ClInclude Include="src\vm.h">
       <Filter>Source Files\Server</Filter>
     </ClInclude>
-    <ClInclude Include="src\pr2_vm.h">
+    <ClInclude Include="src\vm_local.h">
+      <Filter>Source Files\Server</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pr2.h">
       <Filter>Source Files\Server</Filter>
     </ClInclude>
     <ClInclude Include="src\progdefs.h">