diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-08-15 12:36:28 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-08-15 12:36:28 +0200 |
| commit | e7640aebdd60b5a42c1217ebbfc000b813a172a0 (patch) | |
| tree | b3df24d0ac384bbb8d4e8c6b0564c4635cddc242 /build | |
| parent | eac22b00d2b137f86307ade2d82c92a2523e4441 (diff) | |
| parent | eb3ed71ee5e82cc88091035f9916ce1dafc01e85 (diff) | |
Merge branch '2.3' of github.com:mixxxdj/mixxx into serato-beatgrid-import
Diffstat (limited to 'build')
| -rw-r--r-- | build/certificates/windows_sectigo_codesign_certificate.pfx.enc | bin | 0 -> 7520 bytes | |||
| -rw-r--r-- | build/debian/mixxx.links | 1 | ||||
| -rw-r--r-- | build/depends.py | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/build/certificates/windows_sectigo_codesign_certificate.pfx.enc b/build/certificates/windows_sectigo_codesign_certificate.pfx.enc Binary files differnew file mode 100644 index 0000000000..732161ec5a --- /dev/null +++ b/build/certificates/windows_sectigo_codesign_certificate.pfx.enc diff --git a/build/debian/mixxx.links b/build/debian/mixxx.links deleted file mode 100644 index 5ca99e785d..0000000000 --- a/build/debian/mixxx.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/mixxx-data/Mixxx-Manual.pdf usr/share/doc/mixxx/Mixxx-Manual.pdf diff --git a/build/depends.py b/build/depends.py index 4ffd140b2a..cd63a704db 100644 --- a/build/depends.py +++ b/build/depends.py @@ -1429,6 +1429,7 @@ class MixxxCore(Feature): if build.build_is_debug: build.env.Append(CPPDEFINES='MIXXX_BUILD_DEBUG') + build.env.Append(CPPDEFINES='MIXXX_DEBUG_ASSERTIONS_ENABLED') elif build.build_is_release: build.env.Append(CPPDEFINES='MIXXX_BUILD_RELEASE') # Disable assert.h assertions in release mode. Some libraries use @@ -1452,6 +1453,7 @@ class MixxxCore(Feature): if int(SCons.ARGUMENTS.get('debug_assertions_fatal', 0)): build.env.Append(CPPDEFINES='MIXXX_DEBUG_ASSERTIONS_FATAL') + build.env.Append(CPPDEFINES='MIXXX_DEBUG_ASSERTIONS_ENABLED') if build.toolchain_is_gnu: # Default GNU Options |