Skip to content

Commit

Permalink
style: more whitespace fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Spasi
Spasi committed May 11, 2017
1 parent 9d686f4 commit 7e044db
Show file tree
Hide file tree
Showing 20 changed files with 3,076 additions and 3,076 deletions.
668 changes: 334 additions & 334 deletions build.gradle
View file

Large diffs are not rendered by default.

2,254 changes: 1,127 additions & 1,127 deletions build.xml
View file

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions config/build-assets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,63 +10,63 @@ This script downloads such assets from S3.
This script is included in /build.xml and depends on /build-definitions.xml
-->
<project name="assets" basedir="../" xmlns:if="ant:if" xmlns:unless="ant:unless">
<target name="-update-assets">
<uptodate property="assets-uptodate" targetfile="${test.resources}/demo/touch.txt">
<srcfiles dir="${config}/" includes="build-*.xml"/>
</uptodate>
<antcall target="update-assets" unless:set="assets-uptodate"/>
</target>
<target name="-update-assets">
<uptodate property="assets-uptodate" targetfile="${test.resources}/demo/touch.txt">
<srcfiles dir="${config}/" includes="build-*.xml"/>
</uptodate>
<antcall target="update-assets" unless:set="assets-uptodate"/>
</target>

<target name="update-assets" description="Updates the demo assets">
<echo message="Updating..." taskname="Assets"/>
<target name="update-assets" description="Updates the demo assets">
<echo message="Updating..." taskname="Assets"/>

<mkdir dir="${test.resources}/demo/nanovg/images" if:true="${binding.nanovg}"/>
<mkdir dir="${test.resources}/demo/nanovg/images" if:true="${binding.nanovg}"/>

<parallel threadsPerProcessor="4" failonany="true">
<parallel threadsPerProcessor="4" failonany="true">

<update-demo-asset path="footsteps.ogg"/>
<update-demo-asset path="phero.ogg"/>
<get-quiet name="Asset FiraSans" url="https://github.com/google/fonts/raw/master/ofl/firasans/FiraSans-Regular.ttf" dest="${test.resources}/demo/FiraSans.ttf"/>
<update-demo-asset path="footsteps.ogg"/>
<update-demo-asset path="phero.ogg"/>
<get-quiet name="Asset FiraSans" url="https://github.com/google/fonts/raw/master/ofl/firasans/FiraSans-Regular.ttf" dest="${test.resources}/demo/FiraSans.ttf"/>

<update-nanovg-asset path="entypo.ttf"/>
<update-nanovg-asset path="Roboto-Regular.ttf"/>
<update-nanovg-asset path="Roboto-Bold.ttf"/>
<update-nanovg-asset path="NotoEmoji-Regular.ttf"/>
<update-nanovg-asset path="images/image1.jpg"/>
<update-nanovg-asset path="images/image2.jpg"/>
<update-nanovg-asset path="images/image3.jpg"/>
<update-nanovg-asset path="images/image4.jpg"/>
<update-nanovg-asset path="images/image5.jpg"/>
<update-nanovg-asset path="images/image6.jpg"/>
<update-nanovg-asset path="images/image7.jpg"/>
<update-nanovg-asset path="images/image8.jpg"/>
<update-nanovg-asset path="images/image9.jpg"/>
<update-nanovg-asset path="images/image10.jpg"/>
<update-nanovg-asset path="images/image11.jpg"/>
<update-nanovg-asset path="images/image12.jpg"/>
<update-nanovg-asset path="entypo.ttf"/>
<update-nanovg-asset path="Roboto-Regular.ttf"/>
<update-nanovg-asset path="Roboto-Bold.ttf"/>
<update-nanovg-asset path="NotoEmoji-Regular.ttf"/>
<update-nanovg-asset path="images/image1.jpg"/>
<update-nanovg-asset path="images/image2.jpg"/>
<update-nanovg-asset path="images/image3.jpg"/>
<update-nanovg-asset path="images/image4.jpg"/>
<update-nanovg-asset path="images/image5.jpg"/>
<update-nanovg-asset path="images/image6.jpg"/>
<update-nanovg-asset path="images/image7.jpg"/>
<update-nanovg-asset path="images/image8.jpg"/>
<update-nanovg-asset path="images/image9.jpg"/>
<update-nanovg-asset path="images/image10.jpg"/>
<update-nanovg-asset path="images/image11.jpg"/>
<update-nanovg-asset path="images/image12.jpg"/>

<!-- Add more assets here -->
<!-- Add more assets here -->

</parallel>
</parallel>

<touch file="${test.resources}/demo/touch.txt"/>
<echo message="DONE" taskname="Assets"/>
</target>
<touch file="${test.resources}/demo/touch.txt"/>
<echo message="DONE" taskname="Assets"/>
</target>

<macrodef name="update-demo-asset">
<attribute name="path"/>
<macrodef name="update-demo-asset">
<attribute name="path"/>

<sequential>
<get-quiet name="Asset @{path}" url="https://build.lwjgl.org/res/demo/@{path}" dest="${test.resources}/demo/@{path}"/>
</sequential>
</macrodef>
<sequential>
<get-quiet name="Asset @{path}" url="https://build.lwjgl.org/res/demo/@{path}" dest="${test.resources}/demo/@{path}"/>
</sequential>
</macrodef>

<macrodef name="update-nanovg-asset">
<attribute name="path"/>
<macrodef name="update-nanovg-asset">
<attribute name="path"/>

<sequential>
<get-quiet name="NanoVG asset @{path}" url="https://github.com/memononen/nanovg/raw/master/example/@{path}" dest="${test.resources}/demo/nanovg/@{path}" if:true="${binding.nanovg}"/>
</sequential>
</macrodef>
<sequential>
<get-quiet name="NanoVG asset @{path}" url="https://github.com/memononen/nanovg/raw/master/example/@{path}" dest="${test.resources}/demo/nanovg/@{path}" if:true="${binding.nanovg}"/>
</sequential>
</macrodef>

</project>
120 changes: 60 additions & 60 deletions config/build-bindings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,72 +10,72 @@ This script is included in /config/build-definitions.xml.
-->
<project name="bindings" basedir="../">

<property name="binding.DISABLE_CHECKS" value="false"/>
<property name="binding.DISABLE_CHECKS" value="false"/>

<!-- // ========== BINDING FLAGS ======== // -->
<!-- // ========== BINDING FLAGS ======== // -->

<property name="binding.assimp" value="true"/>
<property name="binding.bgfx" value="true"/>
<property name="binding.egl" value="true"/>
<property name="binding.glfw" value="true"/>
<property name="binding.jawt" value="true"/>
<property name="binding.jemalloc" value="true"/>
<property name="binding.lmdb" value="true"/>
<property name="binding.nanovg" value="true"/>
<property name="binding.nfd" value="true"/>
<property name="binding.nuklear" value="true"/>
<property name="binding.openal" value="true"/>
<property name="binding.opencl" value="true"/>
<property name="binding.opengl" value="true"/>
<property name="binding.opengles" value="true"/>
<property name="binding.openvr" value="true"/>
<property name="binding.par" value="true"/>
<property name="binding.sse" value="true"/>
<property name="binding.stb" value="true"/>
<property name="binding.tinyexr" value="true"/>
<property name="binding.tinyfd" value="true"/>
<property name="binding.vulkan" value="true"/>
<property name="binding.xxhash" value="true"/>
<property name="binding.yoga" value="true"/>
<property name="binding.assimp" value="true"/>
<property name="binding.bgfx" value="true"/>
<property name="binding.egl" value="true"/>
<property name="binding.glfw" value="true"/>
<property name="binding.jawt" value="true"/>
<property name="binding.jemalloc" value="true"/>
<property name="binding.lmdb" value="true"/>
<property name="binding.nanovg" value="true"/>
<property name="binding.nfd" value="true"/>
<property name="binding.nuklear" value="true"/>
<property name="binding.openal" value="true"/>
<property name="binding.opencl" value="true"/>
<property name="binding.opengl" value="true"/>
<property name="binding.opengles" value="true"/>
<property name="binding.openvr" value="true"/>
<property name="binding.par" value="true"/>
<property name="binding.sse" value="true"/>
<property name="binding.stb" value="true"/>
<property name="binding.tinyexr" value="true"/>
<property name="binding.tinyfd" value="true"/>
<property name="binding.vulkan" value="true"/>
<property name="binding.xxhash" value="true"/>
<property name="binding.yoga" value="true"/>

<!-- Set the path to the Oculus SDK to enable. -->
<property name="OCULUS_SDK_PATH" location="../OculusSDK" relative="false"/>
<!-- Set the path to the Oculus SDK to enable. -->
<property name="OCULUS_SDK_PATH" location="../OculusSDK" relative="false"/>

<!-- // ================================ // -->
<!-- // ================================ // -->

<target name="bindings">
<condition property="binding.ovr" value="true" else="false">
<and>
<isset property="OCULUS_SDK_PATH"/>
<available file="${OCULUS_SDK_PATH}/LibOVR/Include/OVR_CAPI.h"/>
</and>
</condition>
<target name="bindings">
<condition property="binding.ovr" value="true" else="false">
<and>
<isset property="OCULUS_SDK_PATH"/>
<available file="${OCULUS_SDK_PATH}/LibOVR/Include/OVR_CAPI.h"/>
</and>
</condition>

<local name="dependency_problem"/>
<condition property="dependency_problem" value="1">
<and>
<or>
<!--<istrue value="${binding.glfw}"/>-->
<istrue value="${binding.ovr}"/>
</or>
<isfalse value="${binding.opengl}"/>
</and>
</condition>
<fail if="dependency_problem" message="The OpenGL bindings are required."/>
<local name="dependency_problem"/>
<condition property="dependency_problem" value="1">
<and>
<or>
<!--<istrue value="${binding.glfw}"/>-->
<istrue value="${binding.ovr}"/>
</or>
<isfalse value="${binding.opengl}"/>
</and>
</condition>
<fail if="dependency_problem" message="The OpenGL bindings are required."/>

<condition property="dependency_problem" value="1">
<and>
<istrue value="${binding.nanovg}"/>
<or>
<isfalse value="${binding.stb}"/>
<and>
<isfalse value="${binding.opengl}"/>
<isfalse value="${binding.opengles}"/>
</and>
</or>
</and>
</condition>
<fail if="dependency_problem" message="The stb and OpenGL or OpenGL ES bindings are required."/>
</target>
<condition property="dependency_problem" value="1">
<and>
<istrue value="${binding.nanovg}"/>
<or>
<isfalse value="${binding.stb}"/>
<and>
<isfalse value="${binding.opengl}"/>
<isfalse value="${binding.opengles}"/>
</and>
</or>
</and>
</condition>
<fail if="dependency_problem" message="The stb and OpenGL or OpenGL ES bindings are required."/>
</target>

</project>
Loading

0 comments on commit 7e044db

Please sign in to comment.