Commit graph

6641 commits

Author SHA1 Message Date
Nicolas Noble
2dbab48320
Merge pull request #216 from TotalCaesar659/patch-1
Fix compilation warnings
2020-05-24 11:10:12 -07:00
TotalCaesar659
de3782e51c
Fix compilation warnings 2020-05-24 20:28:45 +03:00
Nicolas Noble
8a0d4a3c4b
Merge pull request #215 from nicolasnoble/drag-n-drop
Adding quick-and-dirty drag-n-drop openfile method.
2020-05-22 18:22:37 -07:00
Nicolas 'Pixel' Noble
ebf82f7680 Adding quick-and-dirty drag-n-drop openfile method. 2020-05-22 17:51:49 -07:00
Nicolas Noble
025e35b525
Merge pull request #214 from nicolasnoble/gdb-server-memory-map
Gdb server memory map
2020-05-22 17:38:50 -07:00
Nicolas 'Pixel' Noble
2712a40069 More comments to XML format. 2020-05-22 16:57:40 -07:00
Nicolas Noble
dbf2c098e4
Adding build instructions. 2020-05-22 16:47:34 -07:00
Nicolas 'Pixel' Noble
287d06ea8a Fixing memory map's XML document. 2020-05-22 16:19:18 -07:00
Nicolas Noble
c3a4c46544
Merge pull request #212 from TotalCaesar659/warnings
Fix compilation warnings
2020-05-22 10:36:28 -07:00
TotalCaesar659
2deb0c3a5d Fix compilation warnings 2020-05-22 20:22:39 +03:00
Nicolas Noble
85c9ed76f5
Merge pull request #210 from nicolasnoble/binary-loader
Adding support for minipsf.
2020-05-21 22:36:43 -07:00
Nicolas 'Pixel' Noble
5ca27cfd49 Merge remote-tracking branch 'upstream/master' into binary-loader 2020-05-21 22:25:41 -07:00
Nicolas Noble
9f9d036ca2
Merge pull request #211 from grumpycoders/nicolasnoble-patch-1
Also activating MacOS tests on pull requests.
2020-05-21 22:25:10 -07:00
Nicolas Noble
9d84e9e7d2
Also activating MacOS tests on pull requests. 2020-05-21 22:12:11 -07:00
Nicolas 'Pixel' Noble
f026ec9c42 Adding support for minipsf. 2020-05-21 21:51:47 -07:00
Nicolas Noble
1529e7367d
Merge pull request #209 from grumpycoders/nicolasnoble-patch-1
Explicitly using GL3W for ImGui
2020-05-21 21:31:30 -07:00
Nicolas Noble
64ccde4d09
Explicitly using GL3W for Imgui 2020-05-21 20:51:07 -07:00
Nicolas Noble
2eb65e1e58
Merge pull request #207 from TotalCaesar659/warnings
Fix compilation warnings
2020-05-21 18:56:19 -07:00
Nicolas Noble
0a57daf3d8
Merge pull request #206 from grumpycoders/discord-badge
Adding Discord badge
2020-05-21 18:48:02 -07:00
TotalCaesar659
3941663426 Fix compilation warnings 2020-05-22 04:38:50 +03:00
Nicolas Noble
3d428395b1
Adding Discord badge 2020-05-21 18:31:58 -07:00
Nicolas Noble
79782b34c2
Merge pull request #205 from TotalCaesar659/patch-2
Fix compilation warnings
2020-05-21 17:49:15 -07:00
TotalCaesar659
6a354aa53c
Fix compilation warnings 2020-05-22 03:10:25 +03:00
Nicolas Noble
43725f4eaf
Merge pull request #204 from TotalCaesar659/fix-linux-build2
Fix building on Linux
2020-05-21 16:18:39 -07:00
Nicolas Noble
61b8e24b17
Merge pull request #203 from TotalCaesar659/patch-1
Fix compilation warnings
2020-05-21 16:17:59 -07:00
TotalCaesar659
ac05bcb535 Fixes 2020-05-22 01:05:58 +03:00
Nicolas Noble
0d760296ee
Making Windows happy 2020-05-21 14:57:35 -07:00
Nicolas Noble
63c8a8f7b5
Merge pull request #201 from grumpycoders/badge
Adding MacOS badge
2020-05-21 14:55:03 -07:00
TotalCaesar659
b8edca1f3c Fix building on Linux 2020-05-22 00:44:26 +03:00
TotalCaesar659
4568cf645f
Fix compilation warnings 2020-05-21 22:46:07 +03:00
Nicolas Noble
932594a5b7
Merge pull request #202 from grumpycoders/nicolasnoble-patch-2
Renaming the job for PR statuses clarity.
2020-05-21 11:33:06 -07:00
Nicolas Noble
3d126204a6
Typo. 2020-05-21 11:31:21 -07:00
Nicolas Noble
504e6f9873
Renaming the job for PR statuses clarity. 2020-05-21 11:20:52 -07:00
Nicolas Noble
b15a307f26
Adding MacOS badge 2020-05-21 11:18:18 -07:00
Nicolas Noble
96dfcfc9d5
Merge pull request #199 from manz/dev/adds-macOs-github-actions
Dev/adds mac os GitHub actions
2020-05-21 11:05:29 -07:00
Emmanuel Peralta
3263880c4f
Removes extra O in license header. 2020-05-21 19:50:56 +02:00
Emmanuel Peralta
16acbdb686
Merge remote-tracking branch 'upstream/master' into dev/adds-macOs-github-actions 2020-05-21 19:38:37 +02:00
Nicolas Noble
ebc712a84b
Merge pull request #198 from TotalCaesar659/fix-linux-build
Fix building on Linux
2020-05-21 10:34:37 -07:00
TotalCaesar659
a1db242410 Fix building on Linux 2020-05-21 20:12:03 +03:00
Emmanuel Peralta
34bb05987a
Use the type of std::filesystem::path().u8string()
to defined PCSX:u8string to avoid issues when u8string supported but the path::u8string method is still std::string.
2020-05-21 19:01:18 +02:00
Emmanuel Peralta
0a003d8845
Uses __APPLE__ ifdef instead of __MACOSX__. 2020-05-21 18:53:26 +02:00
Emmanuel Peralta
7a314380d5
GL_SHADER_VERSION is already defined in gui.h. 2020-05-21 18:52:41 +02:00
Emmanuel Peralta
f9522013e3
Adds missing <string> import. 2020-05-21 18:50:07 +02:00
Emmanuel Peralta
8d0ad5794a
Adds missing parenthesis in the reinterpret_cast. 2020-05-21 18:49:51 +02:00
Emmanuel Peralta
cf67cfd079
Removes extra llvm head LDFLAGS. 2020-05-21 18:49:21 +02:00
Emmanuel Peralta
c90162030d
Adds an external patch for zstr.
It was misdetecting clang and decided to treat it as GCC.
2020-05-21 18:48:34 +02:00
Emmanuel Peralta
78d67c007f
Builds using the two cores that github actions gives us. 2020-05-21 16:59:37 +02:00
Emmanuel Peralta
67178e2d09
Adds pkg-config to brew-installed dependencies. 2020-05-21 16:59:10 +02:00
Emmanuel Peralta
fb7a5ae1e3
Adds submodules initialization. 2020-05-21 16:59:05 +02:00
Emmanuel Peralta
7cc7f214ff
Adds Github Actions workflow for macOS. 2020-05-21 16:56:27 +02:00