Skip to content

Commit

Permalink
Added toolchain functionality to the configure script to allow proper…
Browse files Browse the repository at this point in the history
… building on OS X 10.10. This is the result of Apple

dropping C99 support for their C frameworks in favor of their proprietary LLVM extensions.  Note this will require an updated
version of JNITasks.jar.
  • Loading branch information
kwhat committed Dec 20, 2014
1 parent 0a759df commit dcbeb3a
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,19 @@
</condition>


<!-- Set system specific toolchain. -->
<condition property="ant.build.native.toolchain" value="clang">
<isset property="native.os.isDarwin" />
</condition>
<property name="ant.build.native.toolchain" value="gcc" />


<!-- Set system specific library name. -->
<condition property="ant.build.native.executable" value="lib${ant.project.name}.dylib">
<equals arg1="${ant.build.native.os}" arg2="darwin" />
<isset property="native.os.isDarwin" />
</condition>
<condition property="ant.build.native.executable" value="${ant.project.name}.dll">
<equals arg1="${ant.build.native.os}" arg2="windows" />
<isset property="native.os.isWindows" />
</condition>
<property name="ant.build.native.executable" value="lib${ant.project.name}.so" />

Expand Down Expand Up @@ -316,7 +323,7 @@
<echo>Configuring libUIOHook source...</echo>
<mkdir dir="${dir.bin}/libuiohook" />

<configure dir="${dir.bin}/libuiohook" script="${dir.src}/libuiohook/configure" prefix="${dir.bin}">
<configure toolchain="${ant.build.native.toolchain}" dir="${dir.bin}/libuiohook" script="${dir.src}/libuiohook/configure" prefix="${dir.bin}">
<env key="CFLAGS" value="${ant.build.native.cflags}" />
<env key="LDFLAGS" value="${ant.build.native.ldflags}" />

Expand Down

0 comments on commit dcbeb3a

Please sign in to comment.