diff options
| author | Kenneth Russel <[email protected]> | 2009-06-17 00:06:58 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2009-06-17 00:06:58 +0000 |
| commit | a4163f73b673cfc38b8e682f7d20c2656a876d3d (patch) | |
| tree | 8652a22f34c4ef287e124785e4bbd1e9fff7c85f /make | |
| parent | accaf8dd112ad84a49794c9fd1e82709ddc3c290 (diff) | |
Disable MSVC run-time assertion checking for non-debug builds (unless
the property c.compiler.debug is set to true)
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@149 a78bb65f-1512-4460-ba86-f6dc96a7bf27
Diffstat (limited to 'make')
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index b64abfc..484cb0a 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -433,6 +433,25 @@ <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally --> <property name="c.compiler.debug" value="false" /> + + <condition property="isVC7Debug"> + <and> + <istrue value="${isVC7}" /> + <istrue value="${c.compiler.debug}" /> + </and> + </condition> + <condition property="isVC8Debug"> + <and> + <istrue value="${isVC8}" /> + <istrue value="${c.compiler.debug}" /> + </and> + </condition> + <condition property="isVC9Debug"> + <and> + <istrue value="${isVC9}" /> + <istrue value="${c.compiler.debug}" /> + </and> + </condition> </target> <!-- ================================================================== --> @@ -507,16 +526,16 @@ <compilerarg value="/Gy"/> <!-- enable function level linking --> <compilerarg value="/GS" if="isVC7"/> <!-- buffer security checks --> <compilerarg value="/Wp64" if="isVC7"/> <!-- detect 64-bit port problems --> - <compilerarg value="/RTCcsu" if="isVC7"/> <!-- various runtime checks --> + <compilerarg value="/RTCcsu" if="isVC7Debug"/> <!-- various runtime checks --> <!-- Note: previous compiler options for VC7 were: Debug: /MDd /Yd /GS /RTCs /RTCu /RTCc /W3 /Od /GF /EHsc /Zi /GS /Gy /Wp64 /Zi /D "_DEBUG" Optimized: /MD /W3 /O2 /Ob1 /GF /EHsc /GS /Gy /Wp64 /D "NDEBUG" --> <compilerarg value="/GS" if="isVC8"/> <!-- buffer security checks --> <compilerarg value="/Wp64" if="isVC8"/> <!-- detect 64-bit port problems --> - <compilerarg value="/RTCcsu" if="isVC8"/> <!-- various runtime checks --> + <compilerarg value="/RTCcsu" if="isVC8Debug"/> <!-- various runtime checks --> <compilerarg value="/NODEFAULTLIB:oldnames.lib" if="isVC8"/> <!-- library not available with VC8 --> <compilerarg value="/GS" if="isVC9"/> <!-- buffer security checks --> - <compilerarg value="/RTCcsu" if="isVC9"/> <!-- various runtime checks --> + <compilerarg value="/RTCcsu" if="isVC9Debug"/> <!-- various runtime checks --> <!--compilerarg value="/MT" if="isVC9"/--> <!-- static multithreaded - somehow overwritten by default /MD --> <defineset> |