Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Game Library
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
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Onuralp SEZER
Game Library
Commits
9ea9a725
Commit
9ea9a725
authored
2 years ago
by
Joseph Walton-Rivers
Browse files
Options
Downloads
Patches
Plain Diff
another bullet packing bug
parent
0cda715d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
fggl/phys/bullet/CMakeLists.txt
+2
-1
2 additions, 1 deletion
fggl/phys/bullet/CMakeLists.txt
with
3 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
1
View file @
9ea9a725
...
...
@@ -41,7 +41,7 @@ build:ubuntu:
stage
:
build
before_script
:
-
apt update && apt install -y build-essential cmake
-
apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-dev
-
apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-dev
libbullet-extras-dev
script
:
-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
-
cmake --build build
...
...
This diff is collapsed.
Click to expand it.
fggl/phys/bullet/CMakeLists.txt
+
2
−
1
View file @
9ea9a725
...
...
@@ -13,7 +13,8 @@ else()
target_compile_definitions
(
fggl PUBLIC
${
BULLET_DEFINITIONS
}
)
if
(
BULLET_INCLUDE_DIRS STREQUAL
"include/bullet"
)
# FIXME This might actually be a packaging bug?
# FIXME possible debian packing bug: path is relative in BulletConfig.cmake
# FIXME debian packaging bug: BulletConfig.cmake lists BulletInverseDynamics, but that's packaged in bullet-extras
target_include_directories
(
fggl PUBLIC
${
BULLET_ROOT_DIR
}
/
${
BULLET_INCLUDE_DIRS
}
)
else
()
target_include_directories
(
fggl PUBLIC
${
BULLET_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