Build the compress library on Linux and OS X.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@190 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 2ef384934058702202754bff94cdb3633ca3eb15..5df343c0351704e9f9e7461bd6cb0170c1dd182c 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -72,7 +72,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </if>\r
   </target>\r
   \r
     </if>\r
   </target>\r
   \r

-  <target name="Lib" depends="init" unless="gcc">\r
+  <target name="Lib" depends="init">\r

     <cc name="${ToolChain}" \r
       objdir="${BUILD_DIR}" \r
       outtype="shared" \r
     <cc name="${ToolChain}" \r
       objdir="${BUILD_DIR}" \r
       outtype="shared" \r


@@ -85,7 +85,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r

-      <includepath path="${env.JAVA_HOME}/include/win32"/>\r
+      <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r
+      <includepath path="${env.JAVA_HOME}/include/linux" if="linux"/>\r

       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="kernel32" unless="gcc"/>\r
     </cc>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="kernel32" unless="gcc"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index 6d4d75b62954dbfce9879c94fe12b0307b128f52..d5446f138d92e8de7befa88857166cf6b271208e 100644 (file)
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -75,6 +75,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </then>\r
     </if>\r
 \r
       </then>\r
     </if>\r
 \r

+    <condition property="linux" value="true">\r
+      <os name="Linux"/>\r
+    </condition>\r
+    \r
+    <condition property="windows" value="true">\r
+      <os family="Windows"/>\r
+    </condition>\r
+    \r
+    <condition property="OSX" value="true">\r
+      <os family="Mac"/>\r
+    </condition>\r
+    \r

   </target>\r
   \r
   <target name="Libraries">\r
   </target>\r
   \r
   <target name="Libraries">\r