Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Kart-Public
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
James R.
Kart-Public
Commits
e50eb1f5
Commit
e50eb1f5
authored
6 years ago
by
Alam Arias
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'upstream/master'
parents
af17038c
49dddf54
No related branches found
No related tags found
1 merge request
!2
lol xd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
with
2 additions
and
1 deletion
CMakeLists.txt
+
2
−
1
View file @
e50eb1f5
...
...
@@ -57,7 +57,8 @@ macro(copy_files_to_build_dir target dlllist_var)
endmacro
()
# 64-bit check
if
(
${
CMAKE_SIZEOF_VOID_P
}
EQUAL 8
)
message
(
STATUS
"CMAKE_SIZEOF_VOID_P="
${
CMAKE_SIZEOF_VOID_P
}
)
if
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
message
(
STATUS
"Target is 64-bit"
)
set
(
SRB2_SYSTEM_BITS 64
)
else
()
...
...
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