Emulation/pcsx-redux
1
0
Fork 0
mirror of https://github.com/grumpycoders/pcsx-redux.git synced 2024-06-01 02:38:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updating submodules

Browse source
This commit is contained in:
Nicolas 'Pixel' Noble 2021-01-06 21:23:01 -08:00 committed by Nicolas 'Pixel' Noble
parent 109d9f9861
commit bc3b345e3e
19 changed files with 100 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -13,7 +13,5 @@ jobs:
run: ./.github/scripts/install-brew-dependencies.sh
- name: Fetch submodules
run: git submodule update --init --recursive
- name: Apply zstr patch
run: patch -d third_party/zstr/ -p1 < .github/zstr_strict_fstream_darwin_fix.patch
- name: Build pcsx-redux
run: make -j2

13
.github/zstr_strict_fstream_darwin_fix.patch vendored
View file

@ -1,13 +0,0 @@
diff --git a/src/strict_fstream.hpp b/src/strict_fstream.hpp
index 21173c7..982effc 100644
--- a/src/strict_fstream.hpp
+++ b/src/strict_fstream.hpp
@@ -27,7 +27,7 @@ static std::string strerror()
{
buff = "Unknown error";
}
-#elif (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE
+#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) || defined(__APPLE__)
// XSI-compliant strerror_r()
if (strerror_r(errno, &buff[0], buff.size()) != 0)
{

7
Makefile
View file

@ -14,8 +14,9 @@ CPPFLAGS += -Ithird_party
CPPFLAGS += -Ithird_party/fmt/include/
CPPFLAGS += -Ithird_party/googletest/googletest/include
CPPFLAGS += -Ithird_party/imgui
CPPFLAGS += -Ithird_party/imgui/examples/libs/gl3w
CPPFLAGS += -Ithird_party/imgui/backends
CPPFLAGS += -Ithird_party/imgui/examples
CPPFLAGS += -Ithird_party/imgui/examples/libs/gl3w
CPPFLAGS += -Ithird_party/imgui/misc/cpp
CPPFLAGS += -Ithird_party/imgui_club
CPPFLAGS += -Ithird_party/http-parser
@ -61,8 +62,8 @@ SRCS := $(call rwildcard,src/,*.cc)
SRCS += $(wildcard third_party/fmt/src/*.cc)
SRCS += $(wildcard third_party/imgui/*.cpp)
SRCS += $(wildcard third_party/libelfin/*.cc)
SRCS += third_party/imgui/examples/imgui_impl_opengl3.cpp
SRCS += third_party/imgui/examples/imgui_impl_glfw.cpp
SRCS += third_party/imgui/backends/imgui_impl_opengl3.cpp
SRCS += third_party/imgui/backends/imgui_impl_glfw.cpp
SRCS += third_party/imgui/examples/libs/gl3w/GL/gl3w.c
SRCS += third_party/imgui/misc/cpp/imgui_stdlib.cpp
SRCS += third_party/ImGuiColorTextEdit/TextEditor.cpp

14
src/gui/widgets/assembly.cc
View file

@ -301,22 +301,22 @@ void PCSX::Widgets::Assembly::jumpToMemory(uint32_t addr, int size) {
auto changeDataType = [](MemoryEditor* editor, int size) {
bool isSigned = false;
switch (editor->PreviewDataType) {
case MemoryEditor::DataType_S8:
case MemoryEditor::DataType_S16:
case MemoryEditor::DataType_S32:
case MemoryEditor::DataType_S64:
case ImGuiDataType_S8:
case ImGuiDataType_S16:
case ImGuiDataType_S32:
case ImGuiDataType_S64:
isSigned = true;
break;
}
switch (size) {
case 1:
editor->PreviewDataType = isSigned ? MemoryEditor::DataType_S8 : MemoryEditor::DataType_U8;
editor->PreviewDataType = isSigned ? ImGuiDataType_S8 : ImGuiDataType_U8;
break;
case 2:
editor->PreviewDataType = isSigned ? MemoryEditor::DataType_S16 : MemoryEditor::DataType_U16;
editor->PreviewDataType = isSigned ? ImGuiDataType_S16 : ImGuiDataType_U16;
break;
case 4:
editor->PreviewDataType = isSigned ? MemoryEditor::DataType_S32 : MemoryEditor::DataType_U32;
editor->PreviewDataType = isSigned ? ImGuiDataType_S32 : ImGuiDataType_U32;
break;
}
};

2
third_party/ELFIO vendored

@ -1 +1 @@
Subproject commit fd081b097ca01527dfbd37c2b0a815b3afc32a1e
Subproject commit def3653abcf57e927e2482a4a8d64c55fbf46ff4

2
third_party/ImGuiColorTextEdit vendored

@ -1 +1 @@
Subproject commit df9c9db26b3c4e8346a9dfd2f7a9d9792838c62a
Subproject commit 3b673b404be002d287688292f1d6d1ab59faa3e0

2
third_party/SDL vendored

@ -1 +1 @@
Subproject commit 9333e80281655d2351913ee2418393af991efd36
Subproject commit 5c829aac66a491b9d23b12f4c37bf896dc11f3a8

2
third_party/fmt vendored

@ -1 +1 @@
Subproject commit 5944fcad375e6cdbbd66f3d161a846efd5d16385
Subproject commit 018688da2a58ba25cdf173bd899734f755adb11a

2
third_party/http-parser vendored

@ -1 +1 @@
Subproject commit d9275da4650fd1133ddc96480df32a9efe4b059b
Subproject commit ec8b5ee63f0e51191ea43bb0c6eac7bfbff3141d

2
third_party/imgui vendored

@ -1 +1 @@
Subproject commit 7ddc1adefbdca94e7de350653def7a647ff45612
Subproject commit b11518d7d7fea6c87ccf2174aad34f6cfbad95e2

2
third_party/imgui_club vendored

@ -1 +1 @@
Subproject commit e680ad8d6b9278367d0f71a698beb96b70762ed4
Subproject commit 5e5f32c66ccd486891d46f66ce3a5bbcb9d769fc

2
third_party/libuv vendored

@ -1 +1 @@
Subproject commit f868c9ab0c307525a16fff99fd21e32a6ebc3837
Subproject commit 4e69e333252693bd82d6338d6124f0416538dbfc

2
third_party/zstr vendored

@ -1 +1 @@
Subproject commit 6811097c924346e463b058d63684629bcc5651e0
Subproject commit 8bfd7e7633bc7ba3cf87c152fc3a2bc37559018f

32
vsprojects/SDL/SDL.vcxproj
View file

@ -250,9 +250,11 @@
<ClInclude Include="..\..\third_party\SDL\include\SDL_keyboard.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_keycode.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_loadso.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_locale.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_log.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_main.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_messagebox.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_misc.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_mouse.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_mutex.h" />
<ClInclude Include="..\..\third_party\SDL\include\SDL_name.h" />
@ -308,6 +310,7 @@
<ClInclude Include="..\..\third_party\SDL\src\audio\wasapi\SDL_wasapi.h" />
<ClInclude Include="..\..\third_party\SDL\src\audio\winmm\SDL_winmm.h" />
<ClInclude Include="..\..\third_party\SDL\src\core\windows\SDL_directx.h" />
<ClInclude Include="..\..\third_party\SDL\src\core\windows\SDL_hid.h" />
<ClInclude Include="..\..\third_party\SDL\src\core\windows\SDL_windows.h" />
<ClInclude Include="..\..\third_party\SDL\src\core\windows\SDL_xinput.h" />
<ClInclude Include="..\..\third_party\SDL\src\dynapi\SDL_dynapi.h" />
@ -329,15 +332,20 @@
<ClInclude Include="..\..\third_party\SDL\src\haptic\windows\SDL_dinputhaptic_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\haptic\windows\SDL_windowshaptic_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\haptic\windows\SDL_xinputhaptic_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\hidapi\controller_type.h" />
<ClInclude Include="..\..\third_party\SDL\src\hidapi\hidapi\hidapi.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\controller_type.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\SDL_gamecontrollerdb.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\SDL_joystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\SDL_sysjoystick.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\virtual\SDL_virtualjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\windows\SDL_dinputjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\windows\SDL_rawinputjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\windows\SDL_windowsjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\windows\SDL_xinputjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\libm\math_libm.h" />
<ClInclude Include="..\..\third_party\SDL\src\libm\math_private.h" />
<ClInclude Include="..\..\third_party\SDL\src\locale\SDL_syslocale.h" />
<ClInclude Include="..\..\third_party\SDL\src\render\direct3d11\SDL_shaders_d3d11.h" />
<ClInclude Include="..\..\third_party\SDL\src\render\direct3d\SDL_shaders_d3d.h" />
<ClInclude Include="..\..\third_party\SDL\src\render\opengl\SDL_glfuncs.h" />
@ -359,6 +367,7 @@
<ClInclude Include="..\..\third_party\SDL\src\sensor\dummy\SDL_dummysensor.h" />
<ClInclude Include="..\..\third_party\SDL\src\sensor\SDL_sensor_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\sensor\SDL_syssensor.h" />
<ClInclude Include="..\..\third_party\SDL\src\sensor\windows\SDL_windowssensor.h" />
<ClInclude Include="..\..\third_party\SDL\src\thread\SDL_systhread.h" />
<ClInclude Include="..\..\third_party\SDL\src\thread\SDL_thread_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\thread\windows\SDL_systhread_c.h" />
@ -408,6 +417,7 @@
<ClCompile Include="..\..\third_party\SDL\src\audio\winmm\SDL_winmm.c" />
<ClCompile Include="..\..\third_party\SDL\src\audio\wasapi\SDL_wasapi.c" />
<ClCompile Include="..\..\third_party\SDL\src\audio\wasapi\SDL_wasapi_win32.c" />
<ClCompile Include="..\..\third_party\SDL\src\core\windows\SDL_hid.c" />
<ClCompile Include="..\..\third_party\SDL\src\core\windows\SDL_windows.c" />
<ClCompile Include="..\..\third_party\SDL\src\core\windows\SDL_xinput.c" />
<ClCompile Include="..\..\third_party\SDL\src\cpuinfo\SDL_cpuinfo.c" />
@ -424,21 +434,30 @@
<ClCompile Include="..\..\third_party\SDL\src\events\SDL_windowevents.c" />
<ClCompile Include="..\..\third_party\SDL\src\file\SDL_rwops.c" />
<ClCompile Include="..\..\third_party\SDL\src\filesystem\windows\SDL_sysfilesystem.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\dummy\SDL_syshaptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\SDL_haptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\windows\SDL_dinputhaptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\windows\SDL_windowshaptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\windows\SDL_xinputhaptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\hidapi\windows\hid.c" />
<ClCompile Include="..\..\third_party\SDL\src\hidapi\SDL_hidapi.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\dummy\SDL_sysjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\SDL_gamecontroller.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\SDL_joystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\virtual\SDL_virtualjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_dinputjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_mmjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_rawinputjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_windowsjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_windows_gaming_input.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_xinputjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\libm\e_atan2.c" />
<ClCompile Include="..\..\third_party\SDL\src\libm\e_exp.c" />
@ -461,6 +480,10 @@
<ClCompile Include="..\..\third_party\SDL\src\libm\s_sin.c" />
<ClCompile Include="..\..\third_party\SDL\src\libm\s_tan.c" />
<ClCompile Include="..\..\third_party\SDL\src\loadso\windows\SDL_sysloadso.c" />
<ClCompile Include="..\..\third_party\SDL\src\locale\SDL_locale.c" />
<ClCompile Include="..\..\third_party\SDL\src\locale\windows\SDL_syslocale.c" />
<ClCompile Include="..\..\third_party\SDL\src\misc\SDL_url.c" />
<ClCompile Include="..\..\third_party\SDL\src\misc\windows\SDL_sysurl.c" />
<ClCompile Include="..\..\third_party\SDL\src\power\SDL_power.c" />
<ClCompile Include="..\..\third_party\SDL\src\power\windows\SDL_syspower.c" />
<ClCompile Include="..\..\third_party\SDL\src\render\direct3d11\SDL_shaders_d3d11.c" />
@ -489,12 +512,15 @@
<ClCompile Include="..\..\third_party\SDL\src\SDL_log.c" />
<ClCompile Include="..\..\third_party\SDL\src\sensor\dummy\SDL_dummysensor.c" />
<ClCompile Include="..\..\third_party\SDL\src\sensor\SDL_sensor.c" />
<ClCompile Include="..\..\third_party\SDL\src\sensor\windows\SDL_windowssensor.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_crc32.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_getenv.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_iconv.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_malloc.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_qsort.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_stdlib.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_string.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_strtokr.c" />
<ClCompile Include="..\..\third_party\SDL\src\thread\generic\SDL_syscond.c" />
<ClCompile Include="..\..\third_party\SDL\src\thread\SDL_thread.c" />
<ClCompile Include="..\..\third_party\SDL\src\thread\windows\SDL_sysmutex.c" />
@ -548,4 +574,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

32
vsprojects/SDL/SDL.vcxproj.filters
View file

@ -84,6 +84,9 @@
<ClInclude Include="..\..\third_party\SDL\include\SDL_loadso.h">
<Filter>API Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\SDL\include\SDL_locale.h">
<Filter>API Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\SDL\include\SDL_log.h">
<Filter>API Headers</Filter>
</ClInclude>
@ -228,6 +231,7 @@
<ClInclude Include="..\..\third_party\SDL\include\SDL_vulkan.h">
<Filter>API Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\SDL\include\SDL_misc.h" />
<ClInclude Include="..\..\third_party\SDL\src\audio\directsound\SDL_directsound.h" />
<ClInclude Include="..\..\third_party\SDL\src\audio\disk\SDL_diskaudio.h" />
<ClInclude Include="..\..\third_party\SDL\src\audio\dummy\SDL_dummyaudio.h" />
@ -259,15 +263,20 @@
<ClInclude Include="..\..\third_party\SDL\src\haptic\windows\SDL_dinputhaptic_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\haptic\windows\SDL_windowshaptic_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\haptic\windows\SDL_xinputhaptic_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\hidapi\controller_type.h" />
<ClInclude Include="..\..\third_party\SDL\src\hidapi\hidapi\hidapi.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\controller_type.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\SDL_gamecontrollerdb.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\SDL_joystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\SDL_sysjoystick.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\virtual\SDL_virtualjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\windows\SDL_dinputjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\windows\SDL_rawinputjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\windows\SDL_windowsjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\joystick\windows\SDL_xinputjoystick_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\libm\math_libm.h" />
<ClInclude Include="..\..\third_party\SDL\src\libm\math_private.h" />
<ClInclude Include="..\..\third_party\SDL\src\locale\SDL_syslocale.h" />
<ClInclude Include="..\..\third_party\SDL\src\render\direct3d\SDL_shaders_d3d.h" />
<ClInclude Include="..\..\third_party\SDL\src\render\direct3d11\SDL_shaders_d3d11.h" />
<ClInclude Include="..\..\third_party\SDL\src\render\opengl\SDL_glfuncs.h" />
@ -289,6 +298,7 @@
<ClInclude Include="..\..\third_party\SDL\src\sensor\dummy\SDL_dummysensor.h" />
<ClInclude Include="..\..\third_party\SDL\src\sensor\SDL_sensor_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\sensor\SDL_syssensor.h" />
<ClInclude Include="..\..\third_party\SDL\src\sensor\windows\SDL_windowssensor.h" />
<ClInclude Include="..\..\third_party\SDL\src\thread\SDL_systhread.h" />
<ClInclude Include="..\..\third_party\SDL\src\thread\SDL_thread_c.h" />
<ClInclude Include="..\..\third_party\SDL\src\thread\windows\SDL_systhread_c.h" />
@ -322,6 +332,7 @@
<ClInclude Include="..\..\third_party\SDL\src\video\windows\SDL_windowswindow.h" />
<ClInclude Include="..\..\third_party\SDL\src\video\windows\wmmsg.h" />
<ClInclude Include="..\..\third_party\SDL\src\video\yuv2rgb\yuv_rgb.h" />
<ClInclude Include="..\..\third_party\SDL\src\core\windows\SDL_hid.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\third_party\SDL\src\atomic\SDL_atomic.c" />
@ -339,6 +350,7 @@
<ClCompile Include="..\..\third_party\SDL\src\audio\wasapi\SDL_wasapi.c" />
<ClCompile Include="..\..\third_party\SDL\src\audio\wasapi\SDL_wasapi_win32.c" />
<ClCompile Include="..\..\third_party\SDL\src\audio\winmm\SDL_winmm.c" />
<ClCompile Include="..\..\third_party\SDL\src\core\windows\SDL_hid.c" />
<ClCompile Include="..\..\third_party\SDL\src\core\windows\SDL_windows.c" />
<ClCompile Include="..\..\third_party\SDL\src\core\windows\SDL_xinput.c" />
<ClCompile Include="..\..\third_party\SDL\src\cpuinfo\SDL_cpuinfo.c" />
@ -355,20 +367,29 @@
<ClCompile Include="..\..\third_party\SDL\src\events\SDL_windowevents.c" />
<ClCompile Include="..\..\third_party\SDL\src\file\SDL_rwops.c" />
<ClCompile Include="..\..\third_party\SDL\src\filesystem\windows\SDL_sysfilesystem.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\dummy\SDL_syshaptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\SDL_haptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\windows\SDL_dinputhaptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\windows\SDL_windowshaptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\haptic\windows\SDL_xinputhaptic.c" />
<ClCompile Include="..\..\third_party\SDL\src\hidapi\windows\hid.c" />
<ClCompile Include="..\..\third_party\SDL\src\hidapi\SDL_hidapi.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\dummy\SDL_sysjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\SDL_gamecontroller.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\SDL_joystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\virtual\SDL_virtualjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_dinputjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_mmjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_rawinputjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_windows_gaming_input.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_windowsjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\joystick\windows\SDL_xinputjoystick.c" />
<ClCompile Include="..\..\third_party\SDL\src\libm\e_atan2.c" />
@ -392,6 +413,10 @@
<ClCompile Include="..\..\third_party\SDL\src\libm\s_sin.c" />
<ClCompile Include="..\..\third_party\SDL\src\libm\s_tan.c" />
<ClCompile Include="..\..\third_party\SDL\src\loadso\windows\SDL_sysloadso.c" />
<ClCompile Include="..\..\third_party\SDL\src\locale\SDL_locale.c" />
<ClCompile Include="..\..\third_party\SDL\src\locale\windows\SDL_syslocale.c" />
<ClCompile Include="..\..\third_party\SDL\src\misc\SDL_url.c" />
<ClCompile Include="..\..\third_party\SDL\src\misc\windows\SDL_sysurl.c" />
<ClCompile Include="..\..\third_party\SDL\src\power\SDL_power.c" />
<ClCompile Include="..\..\third_party\SDL\src\power\windows\SDL_syspower.c" />
<ClCompile Include="..\..\third_party\SDL\src\render\direct3d\SDL_render_d3d.c" />
@ -420,12 +445,15 @@
<ClCompile Include="..\..\third_party\SDL\src\SDL_log.c" />
<ClCompile Include="..\..\third_party\SDL\src\sensor\dummy\SDL_dummysensor.c" />
<ClCompile Include="..\..\third_party\SDL\src\sensor\SDL_sensor.c" />
<ClCompile Include="..\..\third_party\SDL\src\sensor\windows\SDL_windowssensor.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_crc32.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_getenv.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_iconv.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_malloc.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_qsort.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_stdlib.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_string.c" />
<ClCompile Include="..\..\third_party\SDL\src\stdlib\SDL_strtokr.c" />
<ClCompile Include="..\..\third_party\SDL\src\thread\generic\SDL_syscond.c" />
<ClCompile Include="..\..\third_party\SDL\src\thread\SDL_thread.c" />
<ClCompile Include="..\..\third_party\SDL\src\thread\windows\SDL_sysmutex.c" />

2
vsprojects/common.props
View file

@ -8,7 +8,7 @@
<ItemDefinitionGroup>
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(SolutionDir)..\src;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\ELFIO;$(SolutionDir)..\third_party\fmt\include;$(SolutionDir)..\third_party\imgui;$(SolutionDir)..\third_party\imgui\examples;$(SolutionDir)..\third_party\imgui\examples\libs\gl3w;$(SolutionDir)..\third_party\imgui\misc\cpp;$(SolutionDir)..\third_party\imgui_club;$(SolutionDir)..\third_party\libelfin;$(SolutionDir)..\third_party\libuv\include;$(SolutionDir)..\third_party\libuv\src;$(SolutionDir)..\third_party\SDL\include;$(SolutionDir)..\third_party\uvw\src;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\third_party\zstr\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..\src;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\ELFIO;$(SolutionDir)..\third_party\fmt\include;$(SolutionDir)..\third_party\imgui;$(SolutionDir)..\third_party\imgui\backends;$(SolutionDir)..\third_party\imgui\examples\libs\gl3w;$(SolutionDir)..\third_party\imgui\misc\cpp;$(SolutionDir)..\third_party\imgui_club;$(SolutionDir)..\third_party\libelfin;$(SolutionDir)..\third_party\libuv\include;$(SolutionDir)..\third_party\libuv\src;$(SolutionDir)..\third_party\SDL\include;$(SolutionDir)..\third_party\uvw\src;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\third_party\zstr\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
<PreprocessorDefinitions>_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_GNU_SOURCE;NOMINMAX;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>

9
vsprojects/imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj
View file

@ -130,18 +130,19 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\third_party\imgui\examples\imgui_impl_glfw.cpp" />
<ClCompile Include="..\..\third_party\imgui\examples\imgui_impl_opengl3.cpp" />
<ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_glfw.cpp" />
<ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_opengl3.cpp" />
<ClCompile Include="..\..\third_party\imgui\examples\libs\gl3w\GL\gl3w.c" />
<ClCompile Include="..\..\third_party\imgui\imgui.cpp" />
<ClCompile Include="..\..\third_party\imgui\imgui_demo.cpp" />
<ClCompile Include="..\..\third_party\imgui\imgui_draw.cpp" />
<ClCompile Include="..\..\third_party\imgui\imgui_tables.cpp" />
<ClCompile Include="..\..\third_party\imgui\imgui_widgets.cpp" />
<ClCompile Include="..\..\third_party\imgui\misc\cpp\imgui_stdlib.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\third_party\imgui\examples\imgui_impl_glfw.h" />
<ClInclude Include="..\..\third_party\imgui\examples\imgui_impl_opengl3.h" />
<ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_glfw.h" />
<ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_opengl3.h" />
<ClInclude Include="..\..\third_party\imgui\examples\libs\gl3w\GL\gl3w.h" />
<ClInclude Include="..\..\third_party\imgui\examples\libs\gl3w\GL\glcorearb.h" />
<ClInclude Include="..\..\third_party\imgui\imconfig.h" />

19
vsprojects/imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj.filters
View file

@ -21,9 +21,6 @@
<ClCompile Include="..\..\third_party\imgui\imgui_draw.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\imgui\examples\imgui_impl_opengl3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\imgui\examples\libs\gl3w\GL\gl3w.c">
<Filter>Source Files</Filter>
</ClCompile>
@ -36,7 +33,13 @@
<ClCompile Include="..\..\third_party\imgui\misc\cpp\imgui_stdlib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\imgui\examples\imgui_impl_glfw.cpp">
<ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_glfw.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_opengl3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\imgui\imgui_tables.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@ -53,9 +56,6 @@
<ClInclude Include="..\..\third_party\imgui\imstb_textedit.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\imgui\examples\imgui_impl_opengl3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\imgui\examples\libs\gl3w\GL\gl3w.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -65,7 +65,10 @@
<ClInclude Include="..\..\third_party\imgui\misc\cpp\imgui_stdlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\imgui\examples\imgui_impl_glfw.h">
<ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_glfw.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_opengl3.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

4
vsprojects/libuv/libuv.vcxproj
View file

@ -80,6 +80,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -93,6 +94,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -104,6 +106,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -117,6 +120,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>