diff options
Diffstat (limited to 'Tools/Conf/BuildMacro.xml')
| -rw-r--r-- | Tools/Conf/BuildMacro.xml | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml index dc5bcfb..85118fb 100644 --- a/Tools/Conf/BuildMacro.xml +++ b/Tools/Conf/BuildMacro.xml @@ -57,14 +57,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. <if>
<equals arg1="${CC_FAMILY}" arg2="GCC"/>
<then>
- <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_OUTPUT}/AutoGen.h.gch" overwrite="true"/>
+ <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_DEBUG}/AutoGen.h.gch" overwrite="true"/>
</then>
- <else>
- <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
- </else>
</if>
</sequential>
</OnDependency>
+
+ <if>
+ <not>
+ <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+ </not>
+ <then>
+ <var name="OBJECTS" value="${OBJECTS} AutoGen.h.obj"/>
+ </then>
+ </if>
</then>
</if>
</sequential>
@@ -504,12 +510,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. <sequential>
<var name="FILE_BASENAME" value="@{FILENAME}" />
<var name="FILE_PATH" value="." />
- <if>
- <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
- <then>
- <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
- </then>
- </if>
<mkdir dir="${BIN_DIR}"/>
<OnDependency>
@@ -753,12 +753,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. <sequential>
<var name="FILE_BASENAME" value="@{FILENAME}" />
<var name="FILE_PATH" value="@{FILEPATH}" />
- <if>
- <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
- <then>
- <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
- </then>
- </if>
<OnDependency>
<sourcefiles>
<file list="${LIBS}"/>
|