Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
RingRacers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lactozilla
RingRacers
Commits
18287e2e
Commit
18287e2e
authored
1 year ago
by
James R.
Browse files
Options
Downloads
Patches
Plain Diff
cmake: always build libgme, even if SRB2_CONFIG_SYSTEM_LIBRARIES
parent
535fc178
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+6
-1
6 additions, 1 deletion
CMakeLists.txt
thirdparty/CMakeLists.txt
+1
-1
1 addition, 1 deletion
thirdparty/CMakeLists.txt
thirdparty/cpm-libgme.cmake
+2
-1
2 additions, 1 deletion
thirdparty/cpm-libgme.cmake
with
9 additions
and
3 deletions
CMakeLists.txt
+
6
−
1
View file @
18287e2e
...
@@ -132,7 +132,12 @@ if("${SRB2_CONFIG_SYSTEM_LIBRARIES}")
...
@@ -132,7 +132,12 @@ if("${SRB2_CONFIG_SYSTEM_LIBRARIES}")
find_package
(
PNG REQUIRED
)
find_package
(
PNG REQUIRED
)
find_package
(
SDL2 REQUIRED
)
find_package
(
SDL2 REQUIRED
)
find_package
(
CURL REQUIRED
)
find_package
(
CURL REQUIRED
)
find_package
(
GME REQUIRED
)
# libgme defaults to "Nuked" YM2612 emulator, which is
# very SLOW. The system library probably uses the
# default so just always build it.
#find_package(GME REQUIRED)
if
(
SRB2_CONFIG_ENABLE_WEBM_MOVIES
)
if
(
SRB2_CONFIG_ENABLE_WEBM_MOVIES
)
find_package
(
VPX REQUIRED
)
find_package
(
VPX REQUIRED
)
find_package
(
Vorbis REQUIRED
)
find_package
(
Vorbis REQUIRED
)
...
...
This diff is collapsed.
Click to expand it.
thirdparty/CMakeLists.txt
+
1
−
1
View file @
18287e2e
...
@@ -14,9 +14,9 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
...
@@ -14,9 +14,9 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
include
(
"cpm-zlib.cmake"
)
include
(
"cpm-zlib.cmake"
)
include
(
"cpm-png.cmake"
)
include
(
"cpm-png.cmake"
)
include
(
"cpm-curl.cmake"
)
include
(
"cpm-curl.cmake"
)
include
(
"cpm-libgme.cmake"
)
endif
()
endif
()
include
(
"cpm-libgme.cmake"
)
include
(
"cpm-glm.cmake"
)
include
(
"cpm-glm.cmake"
)
include
(
"cpm-rapidjson.cmake"
)
include
(
"cpm-rapidjson.cmake"
)
include
(
"cpm-discordrpc.cmake"
)
include
(
"cpm-discordrpc.cmake"
)
...
...
This diff is collapsed.
Click to expand it.
thirdparty/cpm-libgme.cmake
+
2
−
1
View file @
18287e2e
...
@@ -11,5 +11,6 @@ CPMAddPackage(
...
@@ -11,5 +11,6 @@ CPMAddPackage(
if
(
libgme_ADDED
)
if
(
libgme_ADDED
)
target_compile_features
(
gme PRIVATE cxx_std_11
)
target_compile_features
(
gme PRIVATE cxx_std_11
)
target_link_libraries
(
gme PRIVATE ZLIB::ZLIB
)
# libgme's CMakeLists.txt already links this
#target_link_libraries(gme PRIVATE ZLIB::ZLIB)
endif
()
endif
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment