Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
F
FreeBSD ports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
6
Snippets
Groups
Projects
Show more breadcrumbs
FreeBSD
FreeBSD ports
Commits
8037c83d
You need to sign in or sign up before continuing.
Commit
8037c83d
authored
2 years ago
by
Dmitry Marakasov
Committed by
Neel Chauhan
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
games/SpaceCadetPinball: fix installation
PR: 265355
parent
3eaa5027
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
games/SpaceCadetPinball/Makefile
+1
-0
1 addition, 0 deletions
games/SpaceCadetPinball/Makefile
games/SpaceCadetPinball/files/patch-CMakeLists.txt
+17
-22
17 additions, 22 deletions
games/SpaceCadetPinball/files/patch-CMakeLists.txt
with
18 additions
and
22 deletions
games/SpaceCadetPinball/Makefile
+
1
−
0
View file @
8037c83d
PORTNAME
=
SpaceCadetPinball
PORTVERSION
=
2.0.1
PORTREVISION
=
1
DISTVERSIONPREFIX
=
Release_
CATEGORIES
=
games
...
...
This diff is collapsed.
Click to expand it.
games/SpaceCadetPinball/files/patch-CMakeLists.txt
+
17
−
22
View file @
8037c83d
--- CMakeLists.txt.orig 2021-12-29 06:46:09 UTC
+++ CMakeLists.txt
@@ -24,8 +24,10 @@ set(SDL2_BUILDING_LIBRARY ON)
@@ -23,9 +23,10 @@ endif()
set(SDL2_BUILDING_LIBRARY ON)
find_package(SDL2 REQUIRED)
FIND_PACKAGE(SDL2_mixer REQUIRED)
+find_package(X11 REQUIRED)
+link_libraries(${X11_LIBRARIES}
)
FIND_PACKAGE(SDL2_mixer REQUIRED
)
-include_directories(${SDL2_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIR})
+include_directories(${SDL2_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIR} ${X11_INCLUDE_DIR})
get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
foreach(dir ${dirs})
message(STATUS "Include dir='${dir}'")
@@ -201,6 +203,8 @@ endif()
@@ -199,7 +200,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.16.0" OR ${CMAK
)
endif()
target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
-target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
+target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY} ${X11_LIBRARIES})
+install(TARGETS SpaceCadetPinball DESTINATION bin)
+
# On Windows, copy DLL to output
if(WIN32)
list(GET SDL2_LIBRARY -1 SDL2_DLL_PATH)
@@ -216,15 +220,4 @@ if(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SDL2_DLL_PATH}/SDL2.dll" $<TARGET_FILE_DIR:SpaceCadetPinball>
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SDL2_MIXER_DLL_PATH}/SDL2_mixer.dll" $<TARGET_FILE_DIR:SpaceCadetPinball>
)
-endif()
-
-if(UNIX AND NOT APPLE)
- include(GNUInstallDirs)
- install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
@@ -221,8 +222,8 @@ endif()
if(UNIX AND NOT APPLE)
include(GNUInstallDirs)
install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
- install(FILES "/Platform/Linux/${PROJECT_NAME}.desktop" DESTINATION "share/applications")
- install(FILES "/Platform/Linux/${PROJECT_NAME}.metainfo.xml" DESTINATION "share/metainfo")
- foreach(S 16 32 48 128 192
)
-
install(FILES "
${PROJECT_NAME}/Icon_${S}x${S}.png" DESTINATION
- "share/icons/hicolor/${S}x${S}/apps" RENAME "${PROJECT_NAME}.png"
)
- endforeach(S)
endif(
)
+ install(FILES "Platform/Linux/${PROJECT_NAME}.desktop" DESTINATION "share/applications"
)
+
install(FILES "
Platform/Linux/${PROJECT_NAME}.metainfo.xml" DESTINATION "share/metainfo")
foreach(S 16 32 48 128 192
)
install(FILES "${PROJECT_NAME}/Icon_${S}x${S}.png" DESTINATION
"share/icons/hicolor/${S}x${S}/apps" RENAME "${PROJECT_NAME}.png"
)
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