Skip to content

Commit

Permalink
build(remotery): skip natives for Windows arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
Spasi committed Nov 15, 2021
1 parent 02e5523 commit 21cbd2b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
17 changes: 15 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@
</classpath>

<jvmarg line="${generator.bindings}"/>
<jvmarg line="-Dfile.encoding=UTF8 -Dline.separator=&#10;"/>

<arg value="${module.lwjgl}"/>
</java>
Expand Down Expand Up @@ -575,7 +576,7 @@
</target>

<target name="extract" description="Runs the LWJGL Template Extraction tool" depends="compile-native, -compile-extract">
<java classname="org.lwjgl.extract.MainKt" fork="true" spawn="false" taskname="LWJGL Template Extraction Tool">
<java classname="org.lwjgl.extract.MainKt" fork="true" spawn="true" taskname="LWJGL Template Extraction Tool">
<classpath>
<pathelement path="${bin.lwjgl}/core/META-INF/versions/9" if:set="core.java9"/>
<pathelement path="${bin.lwjgl}/core/META-INF/versions/10" if:set="core.java10"/>
Expand Down Expand Up @@ -1575,7 +1576,19 @@
<release-module name="par" native-library="lwjgl_par" title="par" if:true="${binding.par}"/>

<!-- Remotery -->
<release-module name="remotery" native-library="lwjgl_remotery" title="remotery" if:true="${binding.remotery}"/>
<release-module name="remotery" title="remotery" if:true="${binding.remotery}">
<natives>
<get-release platform="linux" arch="x64" file="liblwjgl_remotery.so"/>
<get-release platform="linux" arch="arm64" file="liblwjgl_remotery.so"/>
<get-release platform="linux" arch="arm32" file="liblwjgl_remotery.so"/>

<get-release platform="macos" arch="x64" file="liblwjgl_remotery.dylib"/>
<get-release platform="macos" arch="arm64" file="liblwjgl_remotery.dylib"/>

<get-release platform="windows" arch="x64" file="lwjgl_remotery.dll"/>
<get-release platform="windows" arch="x86" file="lwjgl_remotery.dll"/>
</natives>
</release-module>

<!-- rpmalloc -->
<release-module name="rpmalloc" native-library="lwjgl_rpmalloc" title="rpmalloc" if:true="${binding.rpmalloc}"/>
Expand Down
2 changes: 1 addition & 1 deletion config/build-definitions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ This script is included in /build.xml and /config/update-dependencies.xml.
<property name="bin.ant" location="bin/classes/ant" relative="true"/>
<property name="bin.extract" location="bin/classes/extract" relative="true"/>
<property name="bin.generator" location="bin/classes/generator" relative="true"/>
<property name="bin.javadoc" location="../lwjgl3-javadoc/public" relative="true"/>
<property name="bin.javadoc" location="bin/javadoc" relative="true"/>
<property name="bin.lwjgl" location="bin/classes/lwjgl" relative="true"/>
<property name="bin.samples" location="bin/classes/samples" relative="true"/>
<property name="bin.templates" location="bin/classes/templates" relative="true"/>
Expand Down

0 comments on commit 21cbd2b

Please sign in to comment.