| Line 110... |
Line 110... |
| 110 |
|
110 |
|
| 111 |
<!-- Type of target => executable,plugin,shared,static -->
|
111 |
<!-- Type of target => executable,plugin,shared,static -->
|
| 112 |
<if>
|
112 |
<if>
|
| 113 |
<equals arg1="@{outtype}" arg2="executable"/>
|
113 |
<equals arg1="@{outtype}" arg2="executable"/>
|
| 114 |
<then>
|
114 |
<then>
|
| 115 |
<property name="targetfolder" value="bin.${compile.platform}"/>
|
115 |
<property name="targetfolder" value="bin.${compile.platform}"/>
|
| - |
|
116 |
<property name="@{compiler}@{outtype}@{buildtype}-output_name" value="@{targetname}${@{name}@{compiler}@{buildtype}-compile_type_symbol}"/>
|
| 116 |
</then>
|
117 |
</then>
|
| 117 |
<else>
|
118 |
<else>
|
| 118 |
<property name="targetfolder" value="lib.${compile.platform}"/>
|
119 |
<property name="targetfolder" value="lib.${compile.platform}"/>
|
| - |
|
120 |
<property name="@{compiler}@{outtype}@{buildtype}-output_name" value="@{targetname}${version}${@{name}@{compiler}@{buildtype}-compile_type_symbol}"/>
|
| 119 |
</else>
|
121 |
</else>
|
| 120 |
</if>
|
122 |
</if>
|
| 121 |
|
123 |
|
| 122 |
<mkdir dir="${objdir}/@{buildtype}_@{compiler}"/>
|
124 |
<mkdir dir="${objdir}/@{buildtype}_@{compiler}"/>
|
| 123 |
<mkdir dir="${objdir}/@{buildtype}_@{compiler}/@{targetname}"/>
|
125 |
<mkdir dir="${objdir}/@{buildtype}_@{compiler}/@{targetname}"/>
|
| 124 |
<mkdir dir="@{pkgdir}"/>
|
126 |
<mkdir dir="@{pkgdir}"/>
|
| 125 |
<mkdir dir="@{pkgdir}/${targetfolder}"/>
|
127 |
<mkdir dir="@{pkgdir}/${targetfolder}"/>
|
| 126 |
|
128 |
|
| 127 |
<echo taskname="ant-cppcompile-task">Compile @{name} into @{pkgdir}/${targetfolder}/@{targetname}${@{name}@{compiler}@{buildtype}-compile_type_symbol}</echo>
|
129 |
<echo taskname="ant-cppcompile-task">Compile @{name} into @{pkgdir}/${targetfolder}/${@{compiler}@{outtype}@{buildtype}-output_name}</echo>
|
| 128 |
<echo taskname="ant-cppcompile-task">Using Compiler @{compiler} from @{compilerpath}</echo>
|
130 |
<echo taskname="ant-cppcompile-task">Using Compiler @{compiler} from @{compilerpath}</echo>
|
| 129 |
<echo taskname="ant-cppcompile-task">Placing Objects in ${objdir}/@{buildtype}_@{compiler}/@{targetname}</echo>
|
131 |
<echo taskname="ant-cppcompile-task">Placing Objects in ${objdir}/@{buildtype}_@{compiler}/@{targetname}</echo>
|
| 130 |
<echo taskname="ant-cppcompile-task">Use Compiler Includes from ${@{compiler}_include_@{buildtype}}</echo>
|
132 |
<echo taskname="ant-cppcompile-task">Use Compiler Includes from ${@{compiler}_include_@{buildtype}}</echo>
|
| 131 |
<echo taskname="ant-cppcompile-task">Use Package Includes from @{pkgdir}/include</echo>
|
133 |
<echo taskname="ant-cppcompile-task">Use Package Includes from @{pkgdir}/include</echo>
|
| 132 |
<echo taskname="ant-cppcompile-task">Linking with Library ${@{compiler}_lib_@{buildtype}} Files: ${@{compiler}_libraries_@{buildtype}}</echo>
|
134 |
<echo taskname="ant-cppcompile-task">Linking with Library ${@{compiler}_lib_@{buildtype}} Files: ${@{compiler}_libraries_@{buildtype}}</echo>
|
| Line 138... |
Line 140... |
| 138 |
multithreaded="@{multithreaded}"
|
140 |
multithreaded="@{multithreaded}"
|
| 139 |
optimize="${@{name}@{compiler}@{buildtype}-compile_optimize}"
|
141 |
optimize="${@{name}@{compiler}@{buildtype}-compile_optimize}"
|
| 140 |
debug="${@{name}@{compiler}@{buildtype}-debug_flag}"
|
142 |
debug="${@{name}@{compiler}@{buildtype}-debug_flag}"
|
| 141 |
outtype="@{outtype}"
|
143 |
outtype="@{outtype}"
|
| 142 |
subsystem="@{subsystem}"
|
144 |
subsystem="@{subsystem}"
|
| 143 |
outfile="@{pkgdir}/${targetfolder}/@{targetname}${@{name}@{compiler}@{buildtype}-compile_type_symbol}"
|
145 |
outfile="@{pkgdir}/${targetfolder}/${@{compiler}@{outtype}@{buildtype}-output_name}"
|
| 144 |
objdir="${objdir}/@{buildtype}_@{compiler}/@{targetname}">
|
146 |
objdir="${objdir}/@{buildtype}_@{compiler}/@{targetname}">
|
| 145 |
|
147 |
|
| 146 |
<compiler refid="@{compiler}_compiler_@{buildtype}_@{subsystem}"/>
|
148 |
<compiler refid="@{compiler}_compiler_@{buildtype}_@{subsystem}"/>
|
| 147 |
<linker refid="@{compiler}_linker_@{buildtype}_@{subsystem}"/>
|
149 |
<linker refid="@{compiler}_linker_@{buildtype}_@{subsystem}"/>
|
| 148 |
|
150 |
|