Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GLFWExamples
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
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ACGL
GLFWExamples
Commits
2d949401
Commit
2d949401
authored
11 years ago
by
Robert Menzel
Browse files
Options
Downloads
Patches
Plain Diff
added linker flags needed on some systems
parent
4a080438
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
extern/acgl
+1
-1
1 addition, 1 deletion
extern/acgl
rift/CMakeLists.txt
+1
-1
1 addition, 1 deletion
rift/CMakeLists.txt
shared/SharedCMakeLists.txt
+1
-2
1 addition, 2 deletions
shared/SharedCMakeLists.txt
standalone/CMakeLists.txt
+1
-1
1 addition, 1 deletion
standalone/CMakeLists.txt
with
4 additions
and
5 deletions
acgl
@
198c5888
Compare
53320bc1
...
198c5888
Subproject commit
53320bc182813f39ea98c150cd5c0c6365093fbb
Subproject commit
198c588810039212c7e57c7d0a508e6071e0189e
This diff is collapsed.
Click to expand it.
rift/CMakeLists.txt
+
1
−
1
View file @
2d949401
...
...
@@ -104,7 +104,7 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Linux:
#
IF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
)
SET
(
LIBRARIES
${
CMAKE_SOURCE_DIR
}
/../extern/glfw/src/libglfw3.a -lXrandr -lGL -lXi
)
SET
(
LIBRARIES
${
CMAKE_SOURCE_DIR
}
/../extern/glfw/src/libglfw3.a -lXrandr -lGL -lXi
-pthread -lm -lX11 -lXxf86vm
)
ENDIF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
)
#
#
...
...
This diff is collapsed.
Click to expand it.
shared/SharedCMakeLists.txt
+
1
−
2
View file @
2d949401
...
...
@@ -125,8 +125,7 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Linux:
#
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# SET(LIBRARIES ${CMAKE_SOURCE_DIR}/../extern/glfw/src/libglfw3.a -lXrandr -lX11 -lGLU -lGL -pthread -lm -lrt -ldl -lXi)
SET(LIBRARIES ${CMAKE_SOURCE_DIR}/../extern/glfw/src/libglfw3.a -lXrandr -lGL -lXi)
SET(LIBRARIES ${CMAKE_SOURCE_DIR}/../extern/glfw/src/libglfw3.a -lXrandr -lGL -lXi -pthread -lm -lX11 -lXxf86vm)
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
#
#
...
...
This diff is collapsed.
Click to expand it.
standalone/CMakeLists.txt
+
1
−
1
View file @
2d949401
...
...
@@ -93,7 +93,7 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Linux:
#
IF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
)
SET
(
LIBRARIES
${
CMAKE_SOURCE_DIR
}
/../extern/glfw/src/libglfw3.a -lXrandr -lGL -lXi
)
SET
(
LIBRARIES
${
CMAKE_SOURCE_DIR
}
/../extern/glfw/src/libglfw3.a -lXrandr -lGL -lXi
-pthread -lm -lX11 -lXxf86vm
)
ENDIF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
)
#
#
...
...
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