-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move 3rdparty dependencies to 3rdparty (part 1) #1595
Conversation
I think calling the folder "3rdparty" would make more sense. |
@tambry I had a look at a few other projects, I found some with a folder for that purpose being named "3rdparty" and others with "external" or "externals". Edit1: Let me see if the buildbots build before rebasing the commits |
Commits squashed, build bots are working; |
Rebased |
Does it compile without DX12 SDK? |
@Nekotekina I doubt it, since it requires including some of those files. |
minidx9 is needed for XAudio2 despite being named "dx9". |
@@ -6,7 +6,7 @@ | |||
#ifdef _WIN32 | |||
#include <Windows.h> | |||
#include "GL/gl.h" | |||
#include "GL/glext.h" | |||
#include "externals/GL/glext.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to include "externals" directory so that #include <GL/glext.h> works ?
I prefer the <> syntax for non local includes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(plus "externals" is likely to be removed by linux packager to use system wise includes)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do
I should probably add the stblibs as included dirs as well |
Yes, and for openal too. |
I think 3rdParty also makes more sense, since externals could mean the shader decompiler project which isn't 3rdParty. 3rdParty is clear that the stuff in there isn't anything to do with rpcs3. |
Yeah, I'll change it then (although I wasn't thinking of including the shader decompiler in the externals) |
Ok, I think it's properly done now. |
Rebased and squashed |
@vlj "minidx9 is needed for XAudio2 despite being named "dx9"." |
Shouldn't be merged yet, corrected some paths, will commit soon with the ffmpeg and minidx9 moving |
I don't wanna tackle with the recompilers (asmjit/llvm) and with wxWidgets as for now, so this is basically ready for review and merge. |
There's an issue with libpng on Travis. |
I'm on mobile but I tried applying a fix for the build bots. Will look into it tomorrow if it still doesn't build. |
I found the problem. A typo in CMakeLists |
Who suggested to squash? Now I can't see all the changes. |
@Nekotekina I just squashed to remove some useless commits in between. Everything I did today is in the latest commit |
Also not sure about glm. It was confirmed that we don't need it. |
@Nekotekina but it's included in Emu\RSX\GL\gl_helpers.h
|
For some reason the PR only shows 10 changed lines, but I changed more than that. Also, VS project files are not appearing, although they are changed. Weird. Let me rebase this properly. -- Rebased |
@vlj Can you merge this one first? I'm not managing to git pull --rebase upstream master this properly as it has weird merge conflicts |
Hm, how can I properly solve conflicts between this branch and the base branch? |
@MyaniPT what are these problems exactly? |
Moves GL, minidx12, OpenAL, stblib to 3rdparty Fixes AppVeyor and CMakeLists (travis-ci.yml doesn't need any changes) Points directories in the VS solution files to the new ones on the externals directory Includes stuff with the < > syntax instead of " "
I'm rebasing this properly |
Moves glm and GSL to 3rdparty Moves libpng to 3rdparty
Rebased |
Move 3rdparty dependencies to 3rdparty (part 1)
For the sake of a more organized repository, I've moved some dependencies to a new directory for external 3rdparty dependencies (/3rdparty)