Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zyantific/zydis
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4c6b9392e9818d00d396cd3efc1e169833d5e102
Choose a base ref
..
head repository: zyantific/zydis
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b1e10dbe802b6bb50b8a1c5a231008c27677e2e4
Choose a head ref
Showing with 14 additions and 15 deletions.
  1. +1 −13 Doxyfile.in → Doxyfile.meson.in
  2. +13 −2 meson.build
14 changes: 1 addition & 13 deletions Doxyfile.in → Doxyfile.meson.in
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
PROJECT_NAME = Zydis
@INCLUDE = "@TOP_SRCDIR@/Doxyfile"
PROJECT_NUMBER = @VERSION@
PROJECT_BRIEF = "Zyan Disassembler Library"
OUTPUT_DIRECTORY = "@TOP_BUILDDIR@/doc"
STRIP_FROM_PATH = "@TOP_SRCDIR@"
STRIP_FROM_INC_PATH = "@ZYCORE_INCLUDE_PATH@"
JAVADOC_AUTOBRIEF = YES
QT_AUTOBRIEF = YES
OPTIMIZE_OUTPUT_FOR_C = YES
TOC_INCLUDE_HEADINGS = 0
EXTRACT_ALL = YES
EXTRACT_LOCAL_CLASSES = NO
HIDE_SCOPE_NAMES = YES
INPUT = "@TOP_SRCDIR@/include" \
"@TOP_SRCDIR@/README.md" \
"@TOP_SRCDIR@/files.dox"
RECURSIVE = YES
EXAMPLE_PATH = "@TOP_SRCDIR@/examples"
USE_MDFILE_AS_MAINPAGE = "@TOP_SRCDIR@/README.md"
GENERATE_TREEVIEW = YES
USE_MATHJAX = YES
MATHJAX_VERSION = MathJax_3
GENERATE_LATEX = NO
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
INCLUDE_PATH = "@ZYCORE_INCLUDE_PATH@"
15 changes: 13 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@ knc = knc.enable_if(encoder.enabled())
# Extra targets
examples = examples.disable_if(nolibc)
tools = tools.disable_if(nolibc)
tests = tests.disable_if(nolibc)

examples = examples.disable_auto_if(not root).enable_auto_if(root)
tools = tools.disable_auto_if(not root).enable_auto_if(root)
@@ -77,6 +78,16 @@ if cc.get_argument_syntax() == 'msvc'
language: 'c',
)
endif
elif nolibc
add_project_arguments(
'-fno-stack-protector',
language: 'c',
)
add_project_link_arguments(
'-nostdlib',
'-nodefaultlibs',
language: 'c',
)
endif

if cc.get_linker_id() == 'ld.wasm'
@@ -285,7 +296,7 @@ if doc_req
)

doxyfile = configure_file(
input: 'Doxyfile.in',
input: 'Doxyfile.meson.in',
output: 'Doxyfile',
configuration: cdata,
install: false,
@@ -296,7 +307,7 @@ if doc_req
input: doxyfile,
output: 'doc',
command: [doxygen_exe, doxyfile],
depend_files: [hdrs],
depend_files: [hdrs, files('Doxyfile')],
install: true,
install_dir: datadir / 'doc' / 'Zydis',
)