libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CREATE_PROJECT: Use stricter checks for Win32 dependencies

Browse Source 
Instead of checking the project type, check the define.
winmm and winsparkle are only required on Windows.
This commit is contained in:
SupSuper 2019-07-01 03:06:07 +01:00 committed by Filippos Karapetis
parent 7e6143a641
commit 69cb2ef728
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devtools/create_project/create_project.cpp
View File

@ -366,6 +366,7 @@ int main(int argc, char *argv[]) {
StringList featureDefines = getFeatureDefines(setup.features);
setup.defines.splice(setup.defines.begin(), featureDefines);
bool backendWin32 = false;
if (projectType == kProjectXcode) {
setup.defines.push_back("POSIX");
// Define both MACOSX, and IPHONE, but only one of them will be associated to the
@ -376,13 +377,14 @@ int main(int argc, char *argv[]) {
setup.defines.push_back("MACOSX");
setup.defines.push_back("IPHONE");
} else if (projectType == kProjectMSVC || projectType == kProjectCodeBlocks) {
// Windows only has support for the SDL backend, so we hardcode it here (along with winmm)
setup.defines.push_back("WIN32");
backendWin32 = true;
} else {
// As a last resort, select the backend files to build based on the platform used to build create_project.
// This is broken when cross compiling.
#if defined(_WIN32) || defined(WIN32)
setup.defines.push_back("WIN32");
backendWin32 = true;
#else
setup.defines.push_back("POSIX");
#endif
@ -402,13 +404,13 @@ int main(int argc, char *argv[]) {
if (updatesEnabled) {
setup.defines.push_back("USE_SPARKLE");
if (projectType != kProjectXcode)
if (backendWin32)
setup.libraries.push_back("winsparkle");
else
setup.libraries.push_back("sparkle");
}
if (projectType == kProjectMSVC) {
if (backendWin32) {
if (curlEnabled) {
setup.defines.push_back("CURL_STATICLIB");
setup.libraries.push_back("ws2_32");
@ -419,6 +421,7 @@ int main(int argc, char *argv[]) {
if (sdlnetEnabled) {
setup.libraries.push_back("iphlpapi");
}
setup.libraries.push_back("winmm");
}
setup.defines.push_back("SDL_BACKEND");
@ -433,7 +436,6 @@ int main(int argc, char *argv[]) {
setup.defines.push_back("USE_SDL2");
setup.libraries.push_back("sdl2");
}
setup.libraries.push_back("winmm");
// Add additional project-specific library
#ifdef ADDITIONAL_LIBRARY