Commit Graph

467 Commits

Author SHA1 Message Date
Jamiras 2319b2bde8 fix C89/CXX build 2019-04-20 14:04:50 -06:00
meleu c2364096f3
Merge branch 'master' into runtime_rcheevos_switch 2019-04-19 21:50:00 -03:00
twinaphex b25c571b23 Comment out asserts that can be triggered when launching MaterialUI
in fullscreen mode
2019-04-08 22:25:35 +02:00
meleu 6e730cf2dd update rcheevos files 2019-03-30 15:44:03 -03:00
meleu a77327d20e preventing "always false" alerts 2019-03-24 19:11:48 -03:00
meleu dda6716926 more namespacing work & del rcheevos/test/* files 2019-03-24 12:51:47 -03:00
meleu 4506a58e31 update rcheevos files 2019-03-19 21:13:10 -03:00
Brad Parker 477d46d52b update copyright 2019-02-22 19:13:36 -05:00
orbea 57ec26f269 Add needed protocols to deps/wayland-protocols.
These are included from wayland-protocols-1.17.
2019-02-10 13:43:15 -08:00
radius 671e90a415 [discord] party & ask to join refinements 2019-02-06 22:45:05 -05:00
orbea af813d9c46 Further remove nuklear. 2019-02-02 20:58:47 -08:00
twinaphex 7ad34509e7 Silence more CXX_BUILD warnings 2019-01-12 21:16:48 +01:00
radius 9c4b307dcb Update Discord RPC
Squashed 'deps/discord-rpc/' changes from ba9fe00c4d..7716eadca3

7716eadca3 Update D binding link (#234)
e32d001809 readme nits
2cb9813eb6 Unity specific DLL setup
af380116a0 Check C# strings against UTF8 bytes instead of clamping (#221)
3d3ae7129d Fix mismatched signs in comparison after b44defe (#209)
b44defe60a [Linux] Null-terminate output from readlink in Discord_Register. (#208)
dfad394be0 Added enum for response codes (#207)
a3ad6afee2 Added Discord RPC C# implementation to list. (#205)
7c41a8ec19 Fixed issue with Discord RPC not updating presence during shutdown (#189)
5df1c5ae6d copy the whole folder UE4
c05c7148dd Updated README with UE plugin instructions (#183)

git-subtree-dir: deps/discord-rpc
git-subtree-split: 7716eadca31a0d556f9d71fb610943b203470533
2018-12-28 17:16:13 -05:00
orbea d40da6aca3 Fix c89 'keyword is hidden by macro definition' with clang. 2018-12-16 08:01:03 -08:00
radius bf7c3f17b3 start registering the application so it can be started from discord 2018-10-13 21:09:19 -05:00
twinaphex f336fa0337 CXX_BUILD fixes 2018-10-10 16:38:13 +02:00
twinaphex 072848445c Fix some C89_BUILD errors 2018-10-01 03:31:13 +02:00
leiradel e3eff970f9 Updated rcheevos to 7.1.1 2018-09-30 13:06:42 +01:00
Andre Leiradella 3aa200e3ba Updated rcheevos to 7.1.0 2018-09-29 18:38:21 +01:00
Andre Leiradella 60010b4545 Updated rcheevos to 7.0.2 2018-09-29 16:04:49 +01:00
Andre Leiradella d67aa83f48 Merge branch 'master' into integrate_rcheevos 2018-09-27 21:48:34 +01:00
Andre Leiradella 793205e457 Updated rcheevos to 7.0.1 2018-09-27 21:45:50 +01:00
Ash 751ad68c50 deps/libiosuhax: Fix missing "#include <sys/iosupport.h>" 2018-09-09 18:29:42 +10:00
Andre Leiradella 83169e5fcb Merge branch 'master' into integrate_rcheevos 2018-09-02 14:46:48 +01:00
Andre Leiradella 84124fc70c Removed duplicated Lua files 2018-09-02 14:34:47 +01:00
Andre Leiradella 720ecaff17 Updated rcheevos to 7.0.0 2018-09-02 14:32:08 +01:00
Benjamin FRANCOIS c723f13753 This allows building on Haiku after disabling Discord 2018-09-01 07:25:06 +00:00
Twinaphex 4e0c2314d9 Define HAVE_SSL for OSX 2018-09-01 04:22:57 +02:00
twinaphex 2fb8831dcc Uniquely name functions 2018-09-01 04:18:01 +02:00
twinaphex 31df00d52a Uniquely name functions 2018-09-01 04:14:36 +02:00
twinaphex fb047e4622 Uniquely name functions 2018-09-01 04:12:58 +02:00
twinaphex 18203f4d30 Cleanups 2018-09-01 04:11:16 +02:00
twinaphex 6d29cde453 (SSL) Name functions uniquely 2018-09-01 04:09:59 +02:00
twinaphex e83504002d (SSL) Make these functions unique 2018-09-01 04:08:27 +02:00
Andre Leiradella 3f72e1fd96 Updated rcheevos to 6.5.0 2018-08-28 22:20:38 +01:00
Andre Leiradella 4b2bc29775 Updated rcheevos to 6.4.0 2018-08-28 21:58:13 +01:00
twinaphex f9e8737476 Remove libui - we don't need it anymore now that we have the Qt desktop
UI
2018-08-16 21:34:20 +02:00
twinaphex e74e306947 Relative path include bugfix 2018-08-08 07:38:48 +02:00
twinaphex c59b054ef2 Comment this out 2018-08-08 05:01:22 +02:00
twinaphex f14ae31e93 Uncomment this too 2018-08-08 04:54:11 +02:00
twinaphex e6e35805a6 Enable this 2018-08-08 04:50:16 +02:00
twinaphex 0fb7d6a9e4 (SSL) Re-enable drbg 2018-08-07 04:57:33 +02:00
twinaphex 79f87cbaee More C89_BUILD fixes for mbedtls 2018-08-07 04:48:05 +02:00
twinaphex 6155772c5e mbedtls is not C89_BUILD compatible for now 2018-08-07 03:54:09 +02:00
twinaphex ae69bf9d7b More changes needed for mbedtls/griffin 2018-08-05 01:10:05 +02:00
twinaphex a1e338827c (mbedtls) Changes to make it compatible with Griffin, pt. 1 2018-08-04 21:16:12 +02:00
twinaphex d2613d6e89 (mbedtls) Global variables need to be uniquely namespaced for Griffin 2018-08-04 20:57:23 +02:00
twinaphex 3019748b17 (mbedtls) Use arc4_alt.h 2018-08-04 20:54:11 +02:00
twinaphex ad87ec871d (mbedtls) update asn1parse.c 2018-08-04 20:10:19 +02:00
twinaphex 5b3b3b4a89 (mbedtls) Add arc4_alt.h 2018-08-04 20:09:07 +02:00
Twinaphex 01103dcd23 Cleanups 2018-08-04 20:02:33 +02:00
Andre Leiradella 1c3ae4f01d Added Lua as a dependency 2018-07-31 22:21:49 +01:00
Andre Leiradella e2fc3c11a6 Added rcheevos as a dependency 2018-07-31 22:21:36 +01:00
twinaphex ceaa0259e5 Merge commit 'c8366b0b0f6ab996adcbcf1ee09a3ed6298e7d4e' 2018-07-06 05:17:39 +02:00
twinaphex 155f797ccb Merge commit '2da12dca5803c3dcde920a1cff838fd98aecb36f' 2018-07-04 22:51:43 +02:00
twinaphex 8a1c0be83c (Android) Another potential buildfix; define ENABLE_HLSL
(slang_process) Put HLSL/Cg code around ENABLE_HLSL ifdef
(SPIRV-Cross) Make sure macros no longer need to be redefined; make them
unique in both glsl and hlsl files; needed for Griffin builds
2018-06-26 13:18:17 +02:00
Twinaphex fd11b205da Silence bunch of warnings 2018-06-21 07:52:01 +02:00
twinaphex f8cad6f565 Update glslang 2018-06-20 10:47:08 +02:00
twinaphex 684b2f5722 Get rid of glslang-old 2018-06-20 10:23:00 +02:00
twinaphex abf7bf877e (glslang) Buildfix #1 2018-06-20 10:22:08 +02:00
twinaphex c15950a80c Merge commit 'db3f820301d386847befd1f43da650b2748e3e57' as 'deps/glslang-new' 2018-06-20 10:07:00 +02:00
twinaphex 4fb79dfffe Merge commit '032829847454432a4b149452d6354c13c5888239' 2018-06-20 09:32:45 +02:00
Rob Loach e45692b70d
rapidjson: Remove the gtest folder 2018-06-20 00:23:15 -04:00
radius 00bb17588d Merge commit '6e7a18a5987cbd5dec80308250062867f2cc3aad' as 'deps/discord-rpc/thirdparty/rapidjson-1.1.0' 2018-05-28 23:59:23 -05:00
radius 0308191f88 Merge commit 'b86df4ee09564e88f9d2c994ef9d5af75d4e7395' as 'deps/discord-rpc' 2018-05-28 23:46:51 -05:00
twinaphex 9dea722c39 Update portion of dr_flac.h that was problematic on
certain systems
2018-05-18 05:32:07 +02:00
twinaphex c79950d707 (PS3) Add HAVE_DR_FLAC
(Dr. Flac) Fix some warnings with PS3 compiler
2018-05-07 17:52:53 +02:00
Twinaphex 356cd47ce8 Silence some unused variable warnings 2018-05-03 19:35:27 +02:00
twinaphex f14735961a (libFLAC) turn into relative path header includes 2018-04-28 15:14:53 +02:00
twinaphex e3ce768ad0 (dr_mp3.h) Fix C89_BUILD issues 2018-04-28 14:32:10 +02:00
twinaphex 3583e1e501 Update 2018-04-28 14:22:42 +02:00
twinaphex 381f14fa9a (dr_flac.h) Silence warnings 2018-04-28 13:13:22 +02:00
twinaphex 9a6e069d6f (dr_flac.h) Assume stdint.h presence 2018-04-28 12:44:52 +02:00
twinaphex 89d765d6c7 Define DR_FLAC_NO_STDIO 2018-04-28 12:44:25 +02:00
twinaphex 437c4fbc0a (dr_flac.h) C89_BUILD fixes 2018-04-28 12:37:50 +02:00
twinaphex faa99bd323 Start adding FLAC hooks 2018-04-27 23:45:06 +02:00
twinaphex 958602d328 HAVE_BUILTINFLAC no longer needs to be excluded for C89 2018-04-27 23:17:28 +02:00
twinaphex 1c6a6c80f4 Try to prevent another memory leak - this time in miniupnpc 2018-04-15 18:42:25 +02:00
Twinaphex bd2b913bc6 Silence more warnings 2018-04-13 00:52:52 +02:00
twinaphex 041670fe02 Get rid of multitude of casting warnings 2018-04-13 00:47:42 +02:00
twinaphex 9381d27f1f (miniupnpc) Get rid of warning - value computed is not used 2018-04-09 17:07:43 +02:00
Twinaphex 08a54e45f2 Get rid of a lot of implicit conversions 2018-04-09 15:56:45 +02:00
twinaphex 9639389a66 Uniquely name crc32.c to avoid collissions with statically linked
builds
2018-04-08 17:58:10 +02:00
radius eb1d3f612f try to fix android compilation issues 2018-03-18 11:55:54 -05:00
twinaphex ffbb439fb5 Fix MSVC 2015 solution 2018-03-16 21:45:14 +01:00
aliaspider ff6d24cbef (SPIRV-Cross) Merge commit 'f48c1800c0122e8e7957f572c359e4594932cd4c' 2018-03-06 04:11:59 +01:00
twinaphex 35300bf08b UINT32_MAX not defined on random platforms even though we are including
stdint - just resort to dropping in real value instead
2018-02-07 01:10:14 +01:00
aliaspider 5549b136c2 (msvc) CXX_BUILD + griffin fixes. 2018-02-05 00:25:03 +01:00
twinaphex 47ea7c7cb9 Fix libflac linking errors with CXX_BUILD 2018-02-04 20:42:37 +01:00
twinaphex a180b1094e Add stdint.h to spirv_msl.hpp 2018-02-04 18:55:22 +01:00
twinaphex 2e8569a472 Bake in spirv_msl as well - just use UINT32_MAX - max() numeric_limits
was conflicting with Windows min/max macros
2018-02-04 15:56:50 +01:00
twinaphex 8771171f63 (glslang) Compatibility tweaks for MSVC 2010 compatibility 2018-02-04 15:49:53 +01:00
twinaphex 2963288b29 SPIRV-Cross and glslang will compile with Griffin/MSVC targets now 2018-02-04 14:21:34 +01:00
aliaspider 14d2528da7 Merge commit 'f880cb2d48c302803937f45618392145ab923413' 2018-02-02 13:19:12 +01:00
aliaspider 553f9b705e Merge commit '501fd33b6849de260c6a81fd9575c3aa8a01f7a5' as 'deps/SPIRV-Cross' 2018-02-02 11:53:59 +01:00
aliaspider cd5852d3b0 use git subtree for deps/SPIRV-Cross 2018-02-02 11:53:23 +01:00
twinaphex 445c2dd6f4 (miniupnpc) Another warning fixed 2018-01-31 14:52:29 +01:00
twinaphex 337e185d18 Prevent more warnings with Griffin 2018-01-31 14:49:35 +01:00
twinaphex 5fc95142e5 (miniupnpc) Get rid of PRINT_SOCKET_ERROR 2018-01-31 14:47:00 +01:00
twinaphex ebb65cd781 (libFLAC) use retro_miscellaneous MIN/MAX 2018-01-31 14:40:47 +01:00