Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
raas
BlenderPhi
Commits
121fd266
Commit
121fd266
authored
12 years ago
by
Campbell Barton
Browse files
Options
Downloads
Patches
Plain Diff
for the default make/cmake wrapper, use ../build_os rather then ../build/os
parent
417e99df
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
GNUmakefile
+3
-3
3 additions, 3 deletions
GNUmakefile
with
3 additions
and
3 deletions
GNUmakefile
+
3
−
3
View file @
121fd266
...
@@ -19,9 +19,9 @@
...
@@ -19,9 +19,9 @@
#
#
# ##### END GPL LICENSE BLOCK #####
# ##### END GPL LICENSE BLOCK #####
# This Makefile does an out-of-source CMake build in ../build
/
`OS`_`CPU`
# This Makefile does an out-of-source CMake build in ../build
_
`OS`_`CPU`
# eg:
# eg:
# ../build
/L
inux_i386
# ../build
_l
inux_i386
# This is for users who like to configure & build blender with a single command.
# This is for users who like to configure & build blender with a single command.
...
@@ -40,7 +40,7 @@ ifndef BUILD_CMAKE_ARGS
...
@@ -40,7 +40,7 @@ ifndef BUILD_CMAKE_ARGS
endif
endif
ifndef
BUILD_DIR
ifndef
BUILD_DIR
BUILD_DIR
:=
$(
shell
dirname
$(
BLENDER_DIR
))
/build
/
$(
OS_NCASE
)
BUILD_DIR
:=
$(
shell
dirname
$(
BLENDER_DIR
))
/build
_
$(
OS_NCASE
)
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