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
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
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
Jaden
SRB2
Commits
333d3a25
Commit
333d3a25
authored
4 years ago
by
James R.
Browse files
Options
Downloads
Plain Diff
Merge branch 'cmake-multithreading' into 'master'
Add multithreading option for CMake See merge request
STJr/SRB2!1204
parents
7952408c
1e0beab2
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/CMakeLists.txt
+8
-0
8 additions, 0 deletions
src/CMakeLists.txt
src/sdl/CMakeLists.txt
+4
-0
4 additions, 0 deletions
src/sdl/CMakeLists.txt
with
12 additions
and
0 deletions
src/CMakeLists.txt
+
8
−
0
View file @
333d3a25
...
...
@@ -231,6 +231,8 @@ set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL
"Enable OpenMPT support."
)
set
(
SRB2_CONFIG_HAVE_CURL ON CACHE BOOL
"Enable curl support, used for downloading files via HTTP."
)
set
(
SRB2_CONFIG_HAVE_THREADS ON CACHE BOOL
"Enable multithreading support."
)
if
(
${
CMAKE_SYSTEM
}
MATCHES Windows
)
set
(
SRB2_CONFIG_HAVE_MIXERX ON CACHE BOOL
"Enable SDL Mixer X support."
)
...
...
@@ -470,6 +472,12 @@ if(${SRB2_CONFIG_HAVE_CURL})
endif
()
endif
()
if
(
${
SRB2_CONFIG_HAVE_THREADS
}
)
set
(
SRB2_HAVE_THREADS ON
)
set
(
SRB2_CORE_HEADERS
${
SRB2_CORE_HEADERS
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/i_threads.h
)
add_definitions
(
-DHAVE_THREADS
)
endif
()
if
(
${
SRB2_CONFIG_HWRENDER
}
)
add_definitions
(
-DHWRENDER
)
set
(
SRB2_HWRENDER_SOURCES
...
...
This diff is collapsed.
Click to expand it.
src/sdl/CMakeLists.txt
+
4
−
0
View file @
333d3a25
...
...
@@ -55,6 +55,10 @@ set(SRB2_SDL2_HEADERS
sdlmain.h
)
if
(
${
SRB2_CONFIG_HAVE_THREADS
}
)
set
(
SRB2_SDL2_SOURCES
${
SRB2_SDL2_SOURCES
}
i_threads.c
)
endif
()
source_group
(
"Interface Code"
FILES
${
SRB2_SDL2_SOURCES
}
${
SRB2_SDL2_HEADERS
}
)
# Dependency
...
...
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