Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package 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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
dcfbad21
There was an error fetching the commit references. Please try again later.
Commit
dcfbad21
authored
7 years ago
by
bunnei
Browse files
Options
Downloads
Patches
Plain Diff
cmake: Don't compile Dynarmic as it's unused.
parent
24f10a20
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
externals/CMakeLists.txt
+1
-8
1 addition, 8 deletions
externals/CMakeLists.txt
src/core/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/core/CMakeLists.txt
with
2 additions
and
9 deletions
externals/CMakeLists.txt
+
1
−
8
View file @
dcfbad21
...
@@ -10,13 +10,6 @@ target_include_directories(catch-single-include INTERFACE catch/single_include)
...
@@ -10,13 +10,6 @@ target_include_directories(catch-single-include INTERFACE catch/single_include)
# Crypto++
# Crypto++
add_subdirectory
(
cryptopp
)
add_subdirectory
(
cryptopp
)
# Dynarmic
# Dynarmic will skip defining xbyak if it's already defined, we then define it below
add_library
(
xbyak INTERFACE
)
option
(
DYNARMIC_TESTS OFF
)
set
(
DYNARMIC_NO_BUNDLED_FMT ON
)
add_subdirectory
(
dynarmic
)
# libfmt
# libfmt
add_subdirectory
(
fmt
)
add_subdirectory
(
fmt
)
...
@@ -56,7 +49,7 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
...
@@ -56,7 +49,7 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
# Xbyak
# Xbyak
if
(
ARCHITECTURE_x86_64
)
if
(
ARCHITECTURE_x86_64
)
# Defined before "dynarmic" above
# Defined before "dynarmic" above
#
add_library(xbyak INTERFACE)
add_library
(
xbyak INTERFACE
)
target_include_directories
(
xbyak INTERFACE ./xbyak/xbyak
)
target_include_directories
(
xbyak INTERFACE ./xbyak/xbyak
)
target_compile_definitions
(
xbyak INTERFACE XBYAK_NO_OP_NAMES
)
target_compile_definitions
(
xbyak INTERFACE XBYAK_NO_OP_NAMES
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
src/core/CMakeLists.txt
+
1
−
1
View file @
dcfbad21
...
@@ -158,7 +158,7 @@ set(HEADERS
...
@@ -158,7 +158,7 @@ set(HEADERS
create_directory_groups
(
${
SRCS
}
${
HEADERS
}
)
create_directory_groups
(
${
SRCS
}
${
HEADERS
}
)
add_library
(
core STATIC
${
SRCS
}
${
HEADERS
}
)
add_library
(
core STATIC
${
SRCS
}
${
HEADERS
}
)
target_link_libraries
(
core PUBLIC common PRIVATE audio_core network video_core
)
target_link_libraries
(
core PUBLIC common PRIVATE audio_core network video_core
)
target_link_libraries
(
core PUBLIC Boost::boost PRIVATE cryptopp
dynarmic
fmt lz4_static unicorn
)
target_link_libraries
(
core PUBLIC Boost::boost PRIVATE cryptopp fmt lz4_static unicorn
)
if
(
ENABLE_WEB_SERVICE
)
if
(
ENABLE_WEB_SERVICE
)
target_link_libraries
(
core PUBLIC json-headers web_service
)
target_link_libraries
(
core PUBLIC json-headers web_service
)
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