From 47450bb98cee18cb722d6dd1ddc7ccfeceaa2071 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 11 Sep 2014 17:28:24 -0700 Subject: [PATCH] Disable RTTI for game-agnostic extensions --- extensions/bintools/AMBuilder | 4 ++++ extensions/clientprefs/AMBuilder | 4 ++++ extensions/curl/AMBuilder | 4 ++++ extensions/sqlite/AMBuilder | 4 ++++ extensions/topmenus/AMBuilder | 4 ++++ extensions/updater/AMBuilder | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/extensions/bintools/AMBuilder b/extensions/bintools/AMBuilder index d2617618..bd778dfc 100644 --- a/extensions/bintools/AMBuilder +++ b/extensions/bintools/AMBuilder @@ -8,6 +8,10 @@ binary.compiler.cxxincludes += [ os.path.join(builder.sourcePath, 'public', 'jit'), os.path.join(builder.sourcePath, 'public', 'jit', 'x86'), ] +if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang': + binary.compiler.cxxflags += ['-fno-rtti'] +elif binary.compiler.vendor == 'msvc': + binary.compiler.cxxflags += ['/GR-'] binary.sources += [ 'extension.cpp', diff --git a/extensions/clientprefs/AMBuilder b/extensions/clientprefs/AMBuilder index d7eac743..b30a9f06 100644 --- a/extensions/clientprefs/AMBuilder +++ b/extensions/clientprefs/AMBuilder @@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'clientprefs.ext') binary.compiler.cxxincludes += [ os.path.join(SM.mms_root, 'core', 'sourcehook'), ] +if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang': + binary.compiler.cxxflags += ['-fno-rtti'] +elif binary.compiler.vendor == 'msvc': + binary.compiler.cxxflags += ['/GR-'] binary.sources += [ 'extension.cpp', diff --git a/extensions/curl/AMBuilder b/extensions/curl/AMBuilder index f877b833..b5e6377b 100644 --- a/extensions/curl/AMBuilder +++ b/extensions/curl/AMBuilder @@ -8,6 +8,10 @@ binary.compiler.includes += [ os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'include') ] binary.compiler.defines += ['CURL_STATICLIB'] +if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang': + binary.compiler.cxxflags += ['-fno-rtti'] +elif binary.compiler.vendor == 'msvc': + binary.compiler.cxxflags += ['/GR-'] binary.compiler.postlink += [libcurl.binary] if builder.target_platform == 'linux': binary.compiler.postlink += ['-lrt'] diff --git a/extensions/sqlite/AMBuilder b/extensions/sqlite/AMBuilder index 84584b08..ebed9834 100644 --- a/extensions/sqlite/AMBuilder +++ b/extensions/sqlite/AMBuilder @@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'dbi.sqlite.ext') binary.compiler.cxxincludes += [ os.path.join(SM.mms_root, 'core', 'sourcehook'), ] +if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang': + binary.compiler.cxxflags += ['-fno-rtti'] +elif binary.compiler.vendor == 'msvc': + binary.compiler.cxxflags += ['/GR-'] binary.compiler.defines += [ 'SQLITE_OMIT_LOAD_EXTENSION', diff --git a/extensions/topmenus/AMBuilder b/extensions/topmenus/AMBuilder index 5760bbc5..249894ee 100644 --- a/extensions/topmenus/AMBuilder +++ b/extensions/topmenus/AMBuilder @@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'topmenus.ext') binary.compiler.cxxincludes += [ os.path.join(SM.mms_root, 'core', 'sourcehook'), ] +if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang': + binary.compiler.cxxflags += ['-fno-rtti'] +elif binary.compiler.vendor == 'msvc': + binary.compiler.cxxflags += ['/GR-'] binary.sources += [ 'extension.cpp', diff --git a/extensions/updater/AMBuilder b/extensions/updater/AMBuilder index 6b26b9fc..ed7659c1 100644 --- a/extensions/updater/AMBuilder +++ b/extensions/updater/AMBuilder @@ -5,6 +5,10 @@ binary = SM.ExtLibrary(builder, 'updater.ext') binary.compiler.cxxincludes += [ os.path.join(SM.mms_root, 'core', 'sourcehook'), ] +if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang': + binary.compiler.cxxflags += ['-fno-rtti'] +elif binary.compiler.vendor == 'msvc': + binary.compiler.cxxflags += ['/GR-'] binary.sources += [ 'extension.cpp',