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
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
0f526069
Commit
0f526069
authored
8 years ago
by
Tasos Sahanidis
Browse files
Options
Downloads
Patches
Plain Diff
Pass -DLINUX to n/yasm
parent
cdc9bf3a
No related branches found
No related tags found
1 merge request
!153
CMake: Fix nasm Linux builds
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/CMakeLists.txt
+11
-0
11 additions, 0 deletions
src/CMakeLists.txt
with
11 additions
and
0 deletions
src/CMakeLists.txt
+
11
−
0
View file @
0f526069
...
...
@@ -390,11 +390,22 @@ if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
endif
()
if
(
${
SRB2_CONFIG_USEASM
}
)
#SRB2_ASM_FLAGS can be used to pass flags to either nasm or yasm.
if
(
NOT DEFINED SRB2_ASM_FLAGS
)
set
(
SRB2_ASM_FLAGS
""
)
endif
()
if
(
${
CMAKE_SYSTEM
}
MATCHES
"Linux"
)
set
(
SRB2_ASM_FLAGS
"-DLINUX
${
SRB2_ASM_FLAGS
}
"
)
endif
()
if
(
${
SRB2_CONFIG_YASM
}
)
set
(
CMAKE_ASM_YASM_SOURCE_FILE_EXTENSIONS
${
CMAKE_ASM_YASM_SOURCE_FILE_EXTENSIONS
}
nas
)
set
(
CMAKE_ASM_YASM_FLAGS
"
${
SRB2_ASM_FLAGS
}
"
CACHE STRING
""
)
enable_language
(
ASM_YASM
)
else
()
set
(
CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS
${
CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS
}
nas
)
set
(
CMAKE_ASM_NASM_FLAGS
"
${
SRB2_ASM_FLAGS
}
"
CACHE STRING
""
)
enable_language
(
ASM_NASM
)
endif
()
set
(
SRB2_USEASM ON
)
...
...
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