From 9a1a75e2b0130175b0f2d422d30dd6a3dd2e6a1a Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Mon, 21 Apr 2014 20:04:48 +0200 Subject: [PATCH] ProGen templates: support for additional compiler and linker flags --- .../templates/vs100/Win32/executable/debug_shared.template | 2 ++ .../vs100/Win32/executable/debug_static_md.template | 2 ++ .../vs100/Win32/executable/debug_static_mt.template | 2 ++ .../vs100/Win32/executable/release_shared.template | 2 ++ .../vs100/Win32/executable/release_static_md.template | 2 ++ .../vs100/Win32/executable/release_static_mt.template | 2 ++ ProGen/templates/vs100/Win32/library/debug_shared.template | 2 ++ .../templates/vs100/Win32/library/debug_static_md.template | 1 + .../templates/vs100/Win32/library/debug_static_mt.template | 1 + .../templates/vs100/Win32/library/release_shared.template | 2 ++ .../vs100/Win32/library/release_static_md.template | 1 + .../vs100/Win32/library/release_static_mt.template | 1 + ProGen/templates/vs100/Win32/plugin/debug_shared.template | 2 ++ ProGen/templates/vs100/Win32/plugin/release_shared.template | 2 ++ .../templates/vs100/Win32/testsuite/debug_shared.template | 2 ++ .../vs100/Win32/testsuite/debug_static_md.template | 2 ++ .../vs100/Win32/testsuite/debug_static_mt.template | 2 ++ .../templates/vs100/Win32/testsuite/release_shared.template | 2 ++ .../vs100/Win32/testsuite/release_static_md.template | 2 ++ .../vs100/Win32/testsuite/release_static_mt.template | 2 ++ ProGen/templates/vs100/x64/executable/debug_shared.template | 2 ++ .../templates/vs100/x64/executable/debug_static_md.template | 2 ++ .../templates/vs100/x64/executable/debug_static_mt.template | 2 ++ .../templates/vs100/x64/executable/release_shared.template | 2 ++ .../vs100/x64/executable/release_static_md.template | 2 ++ .../vs100/x64/executable/release_static_mt.template | 2 ++ ProGen/templates/vs100/x64/library/debug_shared.template | 2 ++ ProGen/templates/vs100/x64/library/debug_static_md.template | 1 + ProGen/templates/vs100/x64/library/debug_static_mt.template | 1 + ProGen/templates/vs100/x64/library/release_shared.template | 2 ++ .../templates/vs100/x64/library/release_static_md.template | 1 + .../templates/vs100/x64/library/release_static_mt.template | 1 + ProGen/templates/vs100/x64/plugin/debug_shared.template | 2 ++ ProGen/templates/vs100/x64/plugin/release_shared.template | 2 ++ ProGen/templates/vs100/x64/testsuite/debug_shared.template | 2 ++ .../templates/vs100/x64/testsuite/debug_static_md.template | 2 ++ .../templates/vs100/x64/testsuite/debug_static_mt.template | 2 ++ .../templates/vs100/x64/testsuite/release_shared.template | 2 ++ .../vs100/x64/testsuite/release_static_md.template | 2 ++ .../vs100/x64/testsuite/release_static_mt.template | 2 ++ .../templates/vs110/Win32/executable/debug_shared.template | 2 ++ .../vs110/Win32/executable/debug_static_md.template | 2 ++ .../vs110/Win32/executable/debug_static_mt.template | 2 ++ .../vs110/Win32/executable/release_shared.template | 2 ++ .../vs110/Win32/executable/release_static_md.template | 2 ++ .../vs110/Win32/executable/release_static_mt.template | 2 ++ ProGen/templates/vs110/Win32/library/debug_shared.template | 2 ++ .../templates/vs110/Win32/library/debug_static_md.template | 1 + .../templates/vs110/Win32/library/debug_static_mt.template | 1 + .../templates/vs110/Win32/library/release_shared.template | 2 ++ .../vs110/Win32/library/release_static_md.template | 1 + .../vs110/Win32/library/release_static_mt.template | 1 + ProGen/templates/vs110/Win32/plugin/debug_shared.template | 2 ++ ProGen/templates/vs110/Win32/plugin/release_shared.template | 2 ++ .../templates/vs110/Win32/testsuite/debug_shared.template | 2 ++ .../vs110/Win32/testsuite/debug_static_md.template | 2 ++ .../vs110/Win32/testsuite/debug_static_mt.template | 2 ++ .../templates/vs110/Win32/testsuite/release_shared.template | 2 ++ .../vs110/Win32/testsuite/release_static_md.template | 2 ++ .../vs110/Win32/testsuite/release_static_mt.template | 2 ++ .../templates/vs110/WinCE/executable/debug_shared.template | 2 ++ .../vs110/WinCE/executable/debug_static_md.template | 2 ++ .../vs110/WinCE/executable/debug_static_mt.template | 2 ++ .../vs110/WinCE/executable/release_shared.template | 2 ++ .../vs110/WinCE/executable/release_static_md.template | 2 ++ .../vs110/WinCE/executable/release_static_mt.template | 2 ++ ProGen/templates/vs110/WinCE/library/debug_shared.template | 2 ++ .../templates/vs110/WinCE/library/debug_static_md.template | 1 + .../templates/vs110/WinCE/library/debug_static_mt.template | 1 + .../templates/vs110/WinCE/library/release_shared.template | 2 ++ .../vs110/WinCE/library/release_static_md.template | 1 + .../vs110/WinCE/library/release_static_mt.template | 1 + ProGen/templates/vs110/WinCE/plugin/debug_shared.template | 2 ++ ProGen/templates/vs110/WinCE/plugin/release_shared.template | 2 ++ .../templates/vs110/WinCE/testsuite/debug_shared.template | 2 ++ .../vs110/WinCE/testsuite/debug_static_md.template | 2 ++ .../vs110/WinCE/testsuite/debug_static_mt.template | 2 ++ .../templates/vs110/WinCE/testsuite/release_shared.template | 2 ++ .../vs110/WinCE/testsuite/release_static_md.template | 2 ++ .../vs110/WinCE/testsuite/release_static_mt.template | 2 ++ ProGen/templates/vs110/x64/executable/debug_shared.template | 2 ++ .../templates/vs110/x64/executable/debug_static_md.template | 2 ++ .../templates/vs110/x64/executable/debug_static_mt.template | 2 ++ .../templates/vs110/x64/executable/release_shared.template | 2 ++ .../vs110/x64/executable/release_static_md.template | 2 ++ .../vs110/x64/executable/release_static_mt.template | 2 ++ ProGen/templates/vs110/x64/library/debug_shared.template | 2 ++ ProGen/templates/vs110/x64/library/debug_static_md.template | 1 + ProGen/templates/vs110/x64/library/debug_static_mt.template | 1 + ProGen/templates/vs110/x64/library/release_shared.template | 2 ++ .../templates/vs110/x64/library/release_static_md.template | 1 + .../templates/vs110/x64/library/release_static_mt.template | 1 + ProGen/templates/vs110/x64/plugin/debug_shared.template | 2 ++ ProGen/templates/vs110/x64/plugin/release_shared.template | 2 ++ ProGen/templates/vs110/x64/testsuite/debug_shared.template | 2 ++ .../templates/vs110/x64/testsuite/debug_static_md.template | 2 ++ .../templates/vs110/x64/testsuite/debug_static_mt.template | 2 ++ .../templates/vs110/x64/testsuite/release_shared.template | 2 ++ .../vs110/x64/testsuite/release_static_md.template | 2 ++ .../vs110/x64/testsuite/release_static_mt.template | 2 ++ .../templates/vs120/Win32/executable/debug_shared.template | 2 ++ .../vs120/Win32/executable/debug_static_md.template | 2 ++ .../vs120/Win32/executable/debug_static_mt.template | 2 ++ .../vs120/Win32/executable/release_shared.template | 2 ++ .../vs120/Win32/executable/release_static_md.template | 2 ++ .../vs120/Win32/executable/release_static_mt.template | 2 ++ ProGen/templates/vs120/Win32/library/debug_shared.template | 2 ++ .../templates/vs120/Win32/library/debug_static_md.template | 1 + .../templates/vs120/Win32/library/debug_static_mt.template | 1 + .../templates/vs120/Win32/library/release_shared.template | 2 ++ .../vs120/Win32/library/release_static_md.template | 1 + .../vs120/Win32/library/release_static_mt.template | 1 + ProGen/templates/vs120/Win32/plugin/debug_shared.template | 2 ++ ProGen/templates/vs120/Win32/plugin/release_shared.template | 2 ++ .../templates/vs120/Win32/testsuite/debug_shared.template | 2 ++ .../vs120/Win32/testsuite/debug_static_md.template | 2 ++ .../vs120/Win32/testsuite/debug_static_mt.template | 2 ++ .../templates/vs120/Win32/testsuite/release_shared.template | 2 ++ .../vs120/Win32/testsuite/release_static_md.template | 2 ++ .../vs120/Win32/testsuite/release_static_mt.template | 2 ++ ProGen/templates/vs120/x64/executable/debug_shared.template | 2 ++ .../templates/vs120/x64/executable/debug_static_md.template | 2 ++ .../templates/vs120/x64/executable/debug_static_mt.template | 2 ++ .../templates/vs120/x64/executable/release_shared.template | 2 ++ .../vs120/x64/executable/release_static_md.template | 2 ++ .../vs120/x64/executable/release_static_mt.template | 2 ++ ProGen/templates/vs120/x64/library/debug_shared.template | 2 ++ ProGen/templates/vs120/x64/library/debug_static_md.template | 1 + ProGen/templates/vs120/x64/library/debug_static_mt.template | 1 + ProGen/templates/vs120/x64/library/release_shared.template | 2 ++ .../templates/vs120/x64/library/release_static_md.template | 1 + .../templates/vs120/x64/library/release_static_mt.template | 1 + ProGen/templates/vs120/x64/plugin/debug_shared.template | 2 ++ ProGen/templates/vs120/x64/plugin/release_shared.template | 2 ++ ProGen/templates/vs120/x64/testsuite/debug_shared.template | 2 ++ .../templates/vs120/x64/testsuite/debug_static_md.template | 2 ++ .../templates/vs120/x64/testsuite/debug_static_mt.template | 2 ++ .../templates/vs120/x64/testsuite/release_shared.template | 2 ++ .../vs120/x64/testsuite/release_static_md.template | 2 ++ .../vs120/x64/testsuite/release_static_mt.template | 2 ++ .../templates/vs71/Win32/executable/debug_shared.template | 6 ++++-- .../vs71/Win32/executable/debug_static_md.template | 6 ++++-- .../vs71/Win32/executable/debug_static_mt.template | 6 ++++-- .../templates/vs71/Win32/executable/release_shared.template | 6 ++++-- .../vs71/Win32/executable/release_static_md.template | 6 ++++-- .../vs71/Win32/executable/release_static_mt.template | 6 ++++-- ProGen/templates/vs71/Win32/library/debug_shared.template | 6 ++++-- .../templates/vs71/Win32/library/debug_static_md.template | 3 ++- .../templates/vs71/Win32/library/debug_static_mt.template | 3 ++- ProGen/templates/vs71/Win32/library/release_shared.template | 6 ++++-- .../templates/vs71/Win32/library/release_static_md.template | 3 ++- .../templates/vs71/Win32/library/release_static_mt.template | 3 ++- ProGen/templates/vs71/Win32/plugin/debug_shared.template | 6 ++++-- ProGen/templates/vs71/Win32/plugin/release_shared.template | 6 ++++-- ProGen/templates/vs71/Win32/testsuite/debug_shared.template | 6 ++++-- .../templates/vs71/Win32/testsuite/debug_static_md.template | 6 ++++-- .../templates/vs71/Win32/testsuite/debug_static_mt.template | 6 ++++-- .../templates/vs71/Win32/testsuite/release_shared.template | 6 ++++-- .../vs71/Win32/testsuite/release_static_md.template | 6 ++++-- .../vs71/Win32/testsuite/release_static_mt.template | 6 ++++-- .../templates/vs80/Win32/executable/debug_shared.template | 2 ++ .../vs80/Win32/executable/debug_static_md.template | 2 ++ .../vs80/Win32/executable/debug_static_mt.template | 2 ++ .../templates/vs80/Win32/executable/release_shared.template | 2 ++ .../vs80/Win32/executable/release_static_md.template | 2 ++ .../vs80/Win32/executable/release_static_mt.template | 2 ++ ProGen/templates/vs80/Win32/library/debug_shared.template | 2 ++ .../templates/vs80/Win32/library/debug_static_md.template | 1 + .../templates/vs80/Win32/library/debug_static_mt.template | 1 + ProGen/templates/vs80/Win32/library/release_shared.template | 2 ++ .../templates/vs80/Win32/library/release_static_md.template | 1 + .../templates/vs80/Win32/library/release_static_mt.template | 1 + ProGen/templates/vs80/Win32/plugin/debug_shared.template | 2 ++ ProGen/templates/vs80/Win32/plugin/release_shared.template | 2 ++ ProGen/templates/vs80/Win32/testsuite/debug_shared.template | 2 ++ .../templates/vs80/Win32/testsuite/debug_static_md.template | 2 ++ .../templates/vs80/Win32/testsuite/debug_static_mt.template | 2 ++ .../templates/vs80/Win32/testsuite/release_shared.template | 2 ++ .../vs80/Win32/testsuite/release_static_md.template | 2 ++ .../vs80/Win32/testsuite/release_static_mt.template | 2 ++ .../templates/vs90/Win32/executable/debug_shared.template | 2 ++ .../vs90/Win32/executable/debug_static_md.template | 2 ++ .../vs90/Win32/executable/debug_static_mt.template | 2 ++ .../templates/vs90/Win32/executable/release_shared.template | 2 ++ .../vs90/Win32/executable/release_static_md.template | 2 ++ .../vs90/Win32/executable/release_static_mt.template | 2 ++ ProGen/templates/vs90/Win32/library/debug_shared.template | 2 ++ .../templates/vs90/Win32/library/debug_static_md.template | 1 + .../templates/vs90/Win32/library/debug_static_mt.template | 1 + ProGen/templates/vs90/Win32/library/release_shared.template | 2 ++ .../templates/vs90/Win32/library/release_static_md.template | 1 + .../templates/vs90/Win32/library/release_static_mt.template | 1 + ProGen/templates/vs90/Win32/plugin/debug_shared.template | 2 ++ ProGen/templates/vs90/Win32/plugin/release_shared.template | 2 ++ ProGen/templates/vs90/Win32/testsuite/debug_shared.template | 2 ++ .../templates/vs90/Win32/testsuite/debug_static_md.template | 2 ++ .../templates/vs90/Win32/testsuite/debug_static_mt.template | 2 ++ .../templates/vs90/Win32/testsuite/release_shared.template | 2 ++ .../vs90/Win32/testsuite/release_static_md.template | 2 ++ .../vs90/Win32/testsuite/release_static_mt.template | 2 ++ .../templates/vs90/WinCE/executable/debug_shared.template | 2 ++ .../vs90/WinCE/executable/debug_static_md.template | 2 ++ .../vs90/WinCE/executable/debug_static_mt.template | 2 ++ .../templates/vs90/WinCE/executable/release_shared.template | 2 ++ .../vs90/WinCE/executable/release_static_md.template | 2 ++ .../vs90/WinCE/executable/release_static_mt.template | 2 ++ ProGen/templates/vs90/WinCE/library/debug_shared.template | 2 ++ .../templates/vs90/WinCE/library/debug_static_md.template | 1 + .../templates/vs90/WinCE/library/debug_static_mt.template | 1 + ProGen/templates/vs90/WinCE/library/release_shared.template | 2 ++ .../templates/vs90/WinCE/library/release_static_md.template | 1 + .../templates/vs90/WinCE/library/release_static_mt.template | 1 + ProGen/templates/vs90/WinCE/plugin/debug_shared.template | 2 ++ ProGen/templates/vs90/WinCE/plugin/release_shared.template | 2 ++ ProGen/templates/vs90/WinCE/testsuite/debug_shared.template | 2 ++ .../templates/vs90/WinCE/testsuite/debug_static_md.template | 2 ++ .../templates/vs90/WinCE/testsuite/debug_static_mt.template | 2 ++ .../templates/vs90/WinCE/testsuite/release_shared.template | 2 ++ .../vs90/WinCE/testsuite/release_static_md.template | 2 ++ .../vs90/WinCE/testsuite/release_static_mt.template | 2 ++ ProGen/templates/vs90/x64/executable/debug_shared.template | 2 ++ .../templates/vs90/x64/executable/debug_static_md.template | 2 ++ .../templates/vs90/x64/executable/debug_static_mt.template | 2 ++ .../templates/vs90/x64/executable/release_shared.template | 2 ++ .../vs90/x64/executable/release_static_md.template | 2 ++ .../vs90/x64/executable/release_static_mt.template | 2 ++ ProGen/templates/vs90/x64/library/debug_shared.template | 2 ++ ProGen/templates/vs90/x64/library/debug_static_md.template | 1 + ProGen/templates/vs90/x64/library/debug_static_mt.template | 1 + ProGen/templates/vs90/x64/library/release_shared.template | 2 ++ .../templates/vs90/x64/library/release_static_md.template | 1 + .../templates/vs90/x64/library/release_static_mt.template | 1 + ProGen/templates/vs90/x64/plugin/debug_shared.template | 2 ++ ProGen/templates/vs90/x64/plugin/release_shared.template | 2 ++ ProGen/templates/vs90/x64/testsuite/debug_shared.template | 2 ++ .../templates/vs90/x64/testsuite/debug_static_md.template | 2 ++ .../templates/vs90/x64/testsuite/debug_static_mt.template | 2 ++ ProGen/templates/vs90/x64/testsuite/release_shared.template | 2 ++ .../templates/vs90/x64/testsuite/release_static_md.template | 2 ++ .../templates/vs90/x64/testsuite/release_static_mt.template | 2 ++ 240 files changed, 468 insertions(+), 36 deletions(-) diff --git a/ProGen/templates/vs100/Win32/executable/debug_shared.template b/ProGen/templates/vs100/Win32/executable/debug_shared.template index d50a22883..d88709118 100644 --- a/ProGen/templates/vs100/Win32/executable/debug_shared.template +++ b/ProGen/templates/vs100/Win32/executable/debug_shared.template @@ -39,6 +39,7 @@ DebugInformationFormat="4" CompileAs="0" DisableSpecificWarnings="${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}" /> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> diff --git a/ProGen/templates/vs71/Win32/library/release_static_mt.template b/ProGen/templates/vs71/Win32/library/release_static_mt.template index cba572875..69d2ffb6c 100644 --- a/ProGen/templates/vs71/Win32/library/release_static_mt.template +++ b/ProGen/templates/vs71/Win32/library/release_static_mt.template @@ -27,7 +27,8 @@ Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="0" CompileAs="0" - DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> diff --git a/ProGen/templates/vs71/Win32/plugin/debug_shared.template b/ProGen/templates/vs71/Win32/plugin/debug_shared.template index 73c151211..facc8d0ba 100644 --- a/ProGen/templates/vs71/Win32/plugin/debug_shared.template +++ b/ProGen/templates/vs71/Win32/plugin/debug_shared.template @@ -24,7 +24,8 @@ Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="4" CompileAs="0" - DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/> + DisableSpecificWarnings="4800;${configuration.compiler.disableWarnings}" + AdditionalOptions="${configuration.compiler.additionalOptions}"/> + TargetMachine="1" + AdditionalOptions="${configuration.linker.additionalOptions}"/>