diff options
| author | jfrijters <jfrijters> | 2009-06-26 10:53:09 +0400 |
|---|---|---|
| committer | jfrijters <jfrijters> | 2009-06-26 10:53:09 +0400 |
| commit | 9bd94eb66a542ed149239b9ddf38cba34f10cd11 (patch) | |
| tree | 5bde0465af248ae74f991d2ce8cddce31022bbeb /native/native.build | |
| parent | 3e112f43e39b4d73afb29a1fceb741502d521053 (diff) | |
Changed build to put architecture specific binaries in bin-x86 or bin-x64 directory. Note that the gcc build of libikvm-native.so still goes to bin.
Diffstat (limited to 'native/native.build')
| -rw-r--r-- | native/native.build | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/native/native.build b/native/native.build index 7f9095ae..ae0c368f 100644 --- a/native/native.build +++ b/native/native.build @@ -13,17 +13,21 @@ <copy file="libikvm-native.so" todir="../bin"/> </target> <target name="ikvm-native-win32"> - <mkdir dir="Release"/> - <cl outputdir="Release" options="/O2 /D WIN32 /D NDEBUG /D _WINDLL /D _MBCS /GS /W3 /nologo /c"> + <property name="cpu-arch" value="x86" /> + <!-- HACK this is pretty lame hack to guess if we're about to run the x64 version of CL.EXE --> + <property name="cpu-arch" value="x64" if="${string::contains(string::to-lower(environment::get-variable('PATH')), 'vc\bin\amd64')}" /> + <property name="cpu-arch" value="x64" if="${string::contains(string::to-lower(environment::get-variable('PATH')), 'vc\bin\x86_amd64')}" /> + <mkdir dir="Release-${cpu-arch}"/> + <cl outputdir="Release-${cpu-arch}" options="/O2 /D WIN32 /D NDEBUG /D _WINDLL /D _MBCS /GS /W3 /nologo /c"> <sources> <include name="*.c"/> </sources> </cl> - <link output="Release/ikvm-native.dll" options="/DLL user32.lib"> + <link output="Release-${cpu-arch}/ikvm-native.dll" options="/DLL user32.lib"> <sources> - <include name="Release/*.obj"/> + <include name="Release-${cpu-arch}/*.obj"/> </sources> </link> - <copy file="Release/ikvm-native.dll" todir="../bin" /> + <copy file="Release-${cpu-arch}/ikvm-native.dll" todir="../bin-${cpu-arch}" /> </target> </project> |