Skip to content

Commit

Permalink
SERVER: add support for API16 so we could run latest KTX
Browse files Browse the repository at this point in the history
Seems like there is some issues, minor testing was done under MacOS,
had to compile without optimizations since it crashed with optimizations,
unfortunatelly it doesn't crash without optimizations so was not able to debug it.

Also need to revisit cmodel.c since during "merge" it lost recent sanity checks validations.
  • Loading branch information
Ivan Bolsunov committed Dec 17, 2023
1 parent fa5d11e commit fbcf8a8
Show file tree
Hide file tree
Showing 43 changed files with 8,348 additions and 3,959 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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))
Expand Down
10 changes: 6 additions & 4 deletions ezQuake.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
22 changes: 17 additions & 5 deletions ezQuake.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down
Loading

0 comments on commit fbcf8a8

Please sign in to comment.