mirror of https://github.com/xemu-project/xemu.git
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 6ed44eb604bb6f4070dcc75b0f243a661d0b0eff Mon Sep 17 00:00:00 2001
|
|
From: Matt Borgerson <contact@mborgerson.com>
|
|
Date: Sat, 23 Apr 2022 07:44:03 -0700
|
|
Subject: [PATCH] Fix link order
|
|
|
|
---
|
|
CMakeLists.txt | 27 ++++++++-------------------
|
|
1 file changed, 8 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 644715aae..cc422c356 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1813,9 +1813,8 @@ elseif(WINDOWS)
|
|
file(GLOB VERSION_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.rc)
|
|
file(GLOB SDLMAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.c)
|
|
if(MINGW OR CYGWIN)
|
|
- list(APPEND EXTRA_LIBS mingw32)
|
|
list(APPEND EXTRA_LDFLAGS "-mwindows")
|
|
- list(APPEND SDL_LIBS "-lmingw32" "-mwindows")
|
|
+ list(APPEND SDL_LIBS "-lmingw32")
|
|
if(NOT SDL2_DISABLE_SDL2MAIN)
|
|
set(SDL_CFLAGS "${SDL_CFLAGS} -Dmain=SDL_main")
|
|
list(APPEND SDL_LIBS "-lSDL2main")
|
|
@@ -2697,23 +2696,13 @@ Libs.private:")
|
|
endif()
|
|
|
|
# Clean up the different lists
|
|
- if (VITA)
|
|
- listtostrrev(EXTRA_LIBS _EXTRA_LIBS "-l")
|
|
- set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS})
|
|
- list(REMOVE_DUPLICATES SDL_STATIC_LIBS)
|
|
- listtostrrev(SDL_STATIC_LIBS _SDL_STATIC_LIBS)
|
|
- set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS})
|
|
- listtostrrev(SDL_LIBS _SDL_LIBS)
|
|
- set(SDL_LIBS ${_SDL_LIBS})
|
|
- else()
|
|
- listtostr(EXTRA_LIBS _EXTRA_LIBS "-l")
|
|
- set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS})
|
|
- list(REMOVE_DUPLICATES SDL_STATIC_LIBS)
|
|
- listtostr(SDL_STATIC_LIBS _SDL_STATIC_LIBS)
|
|
- set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS})
|
|
- listtostr(SDL_LIBS _SDL_LIBS)
|
|
- set(SDL_LIBS ${_SDL_LIBS})
|
|
- endif()
|
|
+ listtostrrev(EXTRA_LIBS _EXTRA_LIBS "-l")
|
|
+ set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS})
|
|
+ list(REMOVE_DUPLICATES SDL_STATIC_LIBS)
|
|
+ listtostrrev(SDL_STATIC_LIBS _SDL_STATIC_LIBS)
|
|
+ set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS})
|
|
+ listtostrrev(SDL_LIBS _SDL_LIBS)
|
|
+ set(SDL_LIBS ${_SDL_LIBS})
|
|
|
|
# MESSAGE(STATUS "SDL_LIBS: ${SDL_LIBS}")
|
|
# MESSAGE(STATUS "SDL_STATIC_LIBS: ${SDL_STATIC_LIBS}")
|
|
--
|
|
2.25.1
|
|
|