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
Package registry
Model 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
Unmatched Bracket
SRB2
Commits
4ab2c336
Commit
4ab2c336
authored
9 years ago
by
Monster Iestyn
Browse files
Options
Downloads
Patches
Plain Diff
Possibly fixed the issues with LibGME mentioned in issue #14.
Not even the HAVE_LIBGME macro was defined apparently, huh.
parent
e2b3adc0
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
cmake/Modules/FindGME.cmake
+4
-4
4 additions, 4 deletions
cmake/Modules/FindGME.cmake
src/CMakeLists.txt
+1
-0
1 addition, 0 deletions
src/CMakeLists.txt
src/sdl/CMakeLists.txt
+3
-0
3 additions, 0 deletions
src/sdl/CMakeLists.txt
with
8 additions
and
4 deletions
cmake/Modules/FindGME.cmake
+
4
−
4
View file @
4ab2c336
...
...
@@ -6,16 +6,16 @@ find_path(GME_INCLUDE_DIR
NAMES gme.h
PATHS
${
GME_PKGCONF_INCLUDE_DIRS
}
/usr/include/gme
/usr/local/include/gme
"
/usr/include/gme
"
"
/usr/local/include/gme
"
)
find_library
(
GME_LIBRARY
NAMES gme
PATHS
${
GME_PKGCONF_LIBRARY_DIRS
}
/usr/lib
/usr/local/lib
"
/usr/lib
"
"
/usr/local/lib
"
)
set
(
GME_PROCESS_INCLUDES GME_INCLUDE_DIR
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
1
−
0
View file @
4ab2c336
...
...
@@ -314,6 +314,7 @@ if(${SRB2_CONFIG_HAVE_GME})
find_package
(
GME
)
if
(
${
GME_FOUND
}
)
set
(
SRB2_HAVE_GME ON
)
add_definitions
(
-DHAVE_LIBGME
)
else
()
message
(
WARNING
"You have specified that GME is available but it was not found."
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
src/sdl/CMakeLists.txt
+
3
−
0
View file @
4ab2c336
...
...
@@ -122,6 +122,7 @@ if(${SDL2_FOUND})
add_framework
(
SDL2 SRB2SDL2
)
add_framework
(
SDL2_mixer SRB2SDL2
)
target_link_libraries
(
SRB2SDL2 PRIVATE
${
GME_LIBRARIES
}
${
PNG_LIBRARIES
}
${
ZLIB_LIBRARIES
}
${
OPENGL_LIBRARIES
}
...
...
@@ -131,6 +132,7 @@ if(${SDL2_FOUND})
target_link_libraries
(
SRB2SDL2 PRIVATE
${
SDL2_LIBRARIES
}
${
SDL2_MIXER_LIBRARIES
}
${
GME_LIBRARIES
}
${
PNG_LIBRARIES
}
${
ZLIB_LIBRARIES
}
${
OPENGL_LIBRARIES
}
...
...
@@ -198,6 +200,7 @@ if(${SDL2_FOUND})
target_include_directories
(
SRB2SDL2 PRIVATE
${
SDL2_INCLUDE_DIRS
}
${
SDL2_MIXER_INCLUDE_DIRS
}
${
GME_INCLUDE_DIRS
}
${
PNG_INCLUDE_DIRS
}
${
ZLIB_INCLUDE_DIRS
}
${
OPENGL_INCLUDE_DIRS
}
...
...
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