Update deps for point release

xzn · Aug 20, 2019 · eca4964 · eca4964
1 parent 8286db1
commit eca4964
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/RetroArch/RetroArch b/RetroArch/RetroArch
diff --git a/RetroArch/retroarch.c b/RetroArch/retroarch.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_SLANG
+#undef HAVE_SLANG
+#endif
 #include "RetroArch/retroarch.c"
 #include "retroarch.h"
 

diff --git a/imgui b/imgui
diff --git a/src/main.h b/src/main.h
@@ -6,7 +6,7 @@
 #define ENABLE_SLANG_SHADER 1
 // Custom display resolution seems to work now
 // Custom render resoluton separate from display still broken
-#define ENABLE_CUSTOM_RESOLUTION 2
+#define ENABLE_CUSTOM_RESOLUTION 1
 
 #define UNICODE
 #define _UNICODE
+7 −0		CHANGES.md
+1 −1		Makefile.common
+6 −8		audio/audio_thread_wrapper.c
+12 −0		config.def.h
+8 −20		configuration.c
+6 −1		configuration.h
+0 −12		deps/discord-rpc/include/discord_rpc.h
+0 −142		deps/discord-rpc/src/CMakeLists.txt
+60 −57		deps/discord-rpc/src/connection_unix.cpp
+61 −62		deps/discord-rpc/src/connection_win.cpp
+98 −0		deps/discord-rpc/src/discord_register_linux.c
+0 −102		deps/discord-rpc/src/discord_register_linux.cpp
+191 −0		deps/discord-rpc/src/discord_register_win.c
+0 −185		deps/discord-rpc/src/discord_register_win.cpp
+175 −170		deps/discord-rpc/src/discord_rpc.cpp
+0 −8		deps/discord-rpc/src/dllmain.cpp
+4 −5		deps/discord-rpc/src/msg_queue.h
+66 −61		deps/discord-rpc/src/rpc_connection.cpp
+0 −5		discord/discord.c
+0 −2		discord/discord.h
+0 −4		file_path_special.h
+4 −16		file_path_str.c
+1 −1		frontend/drivers/platform_ps2.c
+1 −1		frontend/frontend_salamander.c
+1 −1		gfx/drivers/d3d11.c
+1 −1		gfx/drivers/gx2_gfx.c
+5 −231		gfx/drivers_shader/glslang_util.c
+6 −43		gfx/drivers_shader/glslang_util.h
+251 −0		gfx/drivers_shader/glslang_util_cxx.cpp
+41 −22		gfx/drivers_shader/glslang_util_cxx.h
+75 −78		gfx/drivers_shader/shader_gl_core.cpp
+1 −0		gfx/drivers_shader/shader_vulkan.cpp
+0 −116		gfx/drivers_shader/slang_preprocess.cpp
+90 −1		gfx/drivers_shader/slang_process.cpp
+15 −0		gfx/drivers_shader/slang_process.h
+14 −15		gfx/video_shader_parse.c
+13 −0		griffin/griffin.c
+1 −6		griffin/griffin_cpp.cpp
+36 −0		intl/msg_hash_ar.h
+36 −0		intl/msg_hash_chs.h
+36 −0		intl/msg_hash_cht.h
+36 −0		intl/msg_hash_de.h
+36 −0		intl/msg_hash_el.h
+36 −0		intl/msg_hash_eo.h
+36 −0		intl/msg_hash_es.h
+36 −0		intl/msg_hash_fr.h
+36 −0		intl/msg_hash_it.h
+86 −10		intl/msg_hash_ja.h
+36 −0		intl/msg_hash_ko.h
+10 −0		intl/msg_hash_lbl.h
+36 −0		intl/msg_hash_nl.h
+36 −0		intl/msg_hash_pl.h
+36 −0		intl/msg_hash_pt_br.h
+36 −0		intl/msg_hash_pt_pt.h
+36 −0		intl/msg_hash_ru.h
+36 −0		intl/msg_hash_tr.h
+44 −0		intl/msg_hash_us.h
+36 −0		intl/msg_hash_vn.h
+0 −3		libretro-common/include/lists/file_list.h
+3 −11		libretro-common/lists/file_list.c
+3 −1		libretro-common/vfs/vfs_implementation.c
+58 −21		menu/cbs/menu_cbs_ok.c
+6 −5		menu/cbs/menu_cbs_start.c
+24 −0		menu/cbs/menu_cbs_sublabel.c
+0 −1		menu/drivers/ozone/ozone_entries.c
+1 −0		menu/drivers/ozone/ozone_texture.c
+1 −0		menu/drivers/xmb.c
+0 −7		menu/menu_defines.h
+29 −15		menu/menu_displaylist.c
+76 −90		menu/menu_driver.c
+0 −7		menu/menu_driver.h
+273 −186		menu/menu_setting.c
+112 −172		menu/menu_shader.c
+16 −8		menu/menu_shader.h
+0 −5		menu/widgets/menu_dialog.c
+7 −1		msg_hash.h
+6 −6		pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
+39 −0		pkg/emscripten/libretro/index.html
+5 −1		ps2/compat_files/compat_ctype.c
+6 −3		ps2/compat_files/fileXio_cdvd.c
+0 −2		ps2/compat_files/ps2_descriptor.c
+3 −2		ps2/compat_files/ps2_devices.c
+25 −2		ps2/compat_files/time.c
+3 −3		ps2/include/inttypes.h
+2 −0		ps2/include/math.h
+0 −2		ps2/include/ps2_descriptor.h
+315 −198		retroarch.c
+5 −2		retroarch.h
+0 −3		setting_list.h
+1 −0		ui/drivers/qt/options/osd.cpp
+38 −11		ui/drivers/qt/shaderparamsdialog.cpp
+1 −0		ui/drivers/qt/shaderparamsdialog.h
+57 −36		ui/drivers/ui_win32.c
+115 −88		verbosity.c
+2 −0		verbosity.h
+1 −0		docs/CHANGELOG.txt
+14 −12		imgui.cpp
+1 −1		imgui_widgets.cpp