Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile error that emerged in the merge

This commit is contained in:
MysterD 2022-02-15 22:29:22 -08:00
parent a1ec9ad628
commit 3e1995bd77
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-windows-visual-studio/sm64ex.vcxproj
View File

@ -463,6 +463,7 @@
<ClCompile Include="..\src\pc\djui\djui_chat_box.c" />
<ClCompile Include="..\src\pc\djui\djui_chat_message.c" />
<ClCompile Include="..\src\pc\djui\djui_checkbox.c" />
<ClCompile Include="..\src\pc\djui\djui_hud_utils.c" />
<ClCompile Include="..\src\pc\djui\djui_inputbox.c" />
<ClCompile Include="..\src\pc\djui\djui_panel_cheats.c" />
<ClCompile Include="..\src\pc\djui\djui_panel_controls.c" />
@ -939,6 +940,7 @@
<ClInclude Include="..\src\pc\djui\djui_chat_box.h" />
<ClInclude Include="..\src\pc\djui\djui_chat_message.h" />
<ClInclude Include="..\src\pc\djui\djui_checkbox.h" />
<ClInclude Include="..\src\pc\djui\djui_hud_utils.h" />
<ClInclude Include="..\src\pc\djui\djui_inputbox.h" />
<ClInclude Include="..\src\pc\djui\djui_panel_cheats.h" />
<ClInclude Include="..\src\pc\djui\djui_panel_controls.h" />

6
build-windows-visual-studio/sm64ex.vcxproj.filters
View File

@ -4890,6 +4890,9 @@
<ClCompile Include="..\src\pc\network\ban_list.c">
<Filter>Source Files\src\pc\network</Filter>
</ClCompile>
<ClCompile Include="..\src\pc\djui\djui_hud_utils.c">
<Filter>Source Files\src\pc\djui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\actors\common0.h">
@ -6055,5 +6058,8 @@
<ClInclude Include="..\src\pc\network\ban_list.h">
<Filter>Source Files\src\pc\network</Filter>
</ClInclude>
<ClInclude Include="..\src\pc\djui\djui_hud_utils.h">
<Filter>Source Files\src\pc\djui</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
developer/network.sh
View File

@ -19,8 +19,8 @@ fi
# no debug, direct
$FILE --server 27015 --configfile sm64config_server.txt &
#sleep 2
#$FILE --client 127.0.0.1 27015 --configfile sm64config_client.txt &
sleep 2
$FILE --client 127.0.0.1 27015 --configfile sm64config_client.txt &
exit
# debug on server

1
src/pc/djui/djui_hud_utils.c
View File

@ -1,6 +1,7 @@
#include <stdio.h>
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include <string.h>
#include "pc/gfx/gfx_pc.h"
#include "pc/gfx/gfx_window_manager_api.h"