Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Merge requests
!406
Update CMake paths for Windows DLLs
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Update CMake paths for Windows DLLs
cmake-dllpath-fix
into
master
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
mazmazz
requested to merge
cmake-dllpath-fix
into
master
6 years ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
Broken by my move of DLLs to
libs/dll-binaries
, whoops!
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
0519d8c5
1 commit,
6 years ago
1 file
+
4
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/sdl/CMakeLists.txt
+
4
−
4
Options
@@ -278,13 +278,13 @@ if(${SDL2_FOUND})
if
(
${
CMAKE_GENERATOR
}
STREQUAL
"MinGW Makefiles"
)
if
(
${
SRB2_SYSTEM_BITS
}
EQUAL 64
)
find_library
(
SRB2_SDL2_DLL_
${
dllname
}
"
${
defaultname
}
"
HINTS
${
CMAKE_SOURCE_DIR
}
/
Bin/Resourc
es/x86_64
HINTS
${
CMAKE_SOURCE_DIR
}
/
libs/dll-binari
es/x86_64
HINTS
${
CMAKE_SOURCE_DIR
}
/libs/SDL2/x86_64-w64-mingw32/bin
HINTS
${
CMAKE_SOURCE_DIR
}
/libs/SDL2_mixer/x86_64-w64-mingw32/bin
)
else
()
find_library
(
SRB2_SDL2_DLL_
${
dllname
}
"
${
defaultname
}
"
HINTS
${
CMAKE_SOURCE_DIR
}
/
Bin/Resourc
es/i686
HINTS
${
CMAKE_SOURCE_DIR
}
/
libs/dll-binari
es/i686
HINTS
${
CMAKE_SOURCE_DIR
}
/libs/SDL2/i686-w64-mingw32/bin
HINTS
${
CMAKE_SOURCE_DIR
}
/libs/SDL2_mixer/i686-w64-mingw32/bin
)
@@ -292,13 +292,13 @@ if(${SDL2_FOUND})
else
()
if
(
${
SRB2_SYSTEM_BITS
}
EQUAL 64
)
find_library
(
SRB2_SDL2_DLL_
${
dllname
}
"
${
defaultname
}
"
HINTS
${
CMAKE_SOURCE_DIR
}
/
Bin/Resourc
es/x86_64
HINTS
${
CMAKE_SOURCE_DIR
}
/
libs/dll-binari
es/x86_64
HINTS
${
CMAKE_SOURCE_DIR
}
/libs/SDL2/lib/x64
HINTS
${
CMAKE_SOURCE_DIR
}
/libs/SDL2_mixer/lib/x64
)
else
()
find_library
(
SRB2_SDL2_DLL_
${
dllname
}
"
${
defaultname
}
"
HINTS
${
CMAKE_SOURCE_DIR
}
/
Bin/Resourc
es/i686
HINTS
${
CMAKE_SOURCE_DIR
}
/
libs/dll-binari
es/i686
HINTS
${
CMAKE_SOURCE_DIR
}
/libs/SDL2/lib/x86
HINTS
${
CMAKE_SOURCE_DIR
}
/libs/SDL2_mixer/lib/x86
)
Loading