Skip to content

Commit

Permalink
Remove whitespace lines
Browse files Browse the repository at this point in the history
  • Loading branch information
jgranick committed Jul 19, 2018
1 parent d3269a7 commit 78e99bf
Show file tree
Hide file tree
Showing 447 changed files with 36,862 additions and 36,894 deletions.
37 changes: 3 additions & 34 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"editor.trimAutoWhitespace": false,
"editor.insertSpaces": false,
"editor.trimAutoWhitespace": true,
"codedox": {
"commentprefix": " ",
"commentdescription": "",
Expand All @@ -10,37 +10,6 @@
"returnFormat": "",
"neverAskTemplate": true
},
"files.associations": {
"initializer_list": "cpp",
"list": "cpp",
"type_traits": "cpp",
"vector": "cpp",
"xhash": "cpp",
"xstring": "cpp",
"xtree": "cpp",
"xutility": "cpp",
"system_error": "cpp",
"xfunctional": "cpp",
"chrono": "cpp",
"ratio": "cpp",
"xlocmon": "cpp",
"xstddef": "cpp",
"xtr1common": "cpp",
"iterator": "cpp",
"map": "cpp",
"memory": "cpp",
"set": "cpp",
"streambuf": "cpp",
"unordered_map": "cpp",
"xmemory0": "cpp",
"xiosbase": "c",
"xlocale": "c",
"iosfwd": "cpp",
"array": "cpp",
"functional": "cpp",
"tuple": "cpp",
"utility": "cpp",
"sstream": "cpp",
"mutex": "cpp"
}
"files.trimTrailingWhitespace": true,
"C_Cpp.autoAddFileAssociations": false,
}
98 changes: 49 additions & 49 deletions include.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<extension>

<log error="Lime ${lime} is not compatible with Haxe ${haxe} (version 3.2.0 or higher is required)" if="${haxe < 3.2.0}" />

<set name="lime" />

<define name="native" if="cpp || neko || nodejs || cs || java || hl" />
<define name="howlerjs" if="html5" />

<define name="lime-cairo" if="native" />
<define name="lime-canvas" if="html5" />
<define name="lime-cffi" if="native" />
Expand All @@ -22,41 +22,41 @@
<define name="lime-opengles" if="emscripten || mobile" />
<define name="lime-vorbis" if="native" />
<define name="lime-webgl" if="html5" />

<define name="no-typedarray-inline" if="cs" />
<haxedef name="no-compilation" />

<templatePath name="templates" />
<source path="externs/air" if="air" />
<haxeflag name="--macro" value="allowPackage('sys')" if="air" />
<sample path="samples" unless="openfl" />

<haxelib name="nodejs" if="nodejs" />
<haxelib name="format" if="java" />

<target name="ps3" handler="lime-ps3" />
<haxelib name="lime-ps3" if="ps3" />

<target name="ps4" handler="lime-ps4" />
<haxelib name="lime-ps4" if="ps4" />

<target name="vita" handler="lime-vita" />
<haxelib name="lime-vita" if="vita" />

<target name="switch" handler="lime-switch" />
<haxelib name="lime-switch" if="switch" />

<target name="wiiu" handler="lime-wiiu" />
<haxelib name="lime-wiiu" if="wiiu" />

<target name="xbox1" handler="lime-xbox1" />
<haxelib name="lime-xbox1" if="xbox1" />

<target name="console-pc" handler="lime-console-pc" />
<haxelib name="lime-console-pc" if="console-pc" />

<section if="hxp" unless="lime-tools">

<target name="air" path="tools/platforms/AIRPlatform.hx" />
<target name="android" path="tools/platforms/AndroidPlatform.hx" />
<target name="emscripten" path="tools/platforms/EmscriptenPlatform.hx" />
Expand All @@ -67,19 +67,19 @@
<target name="mac" path="tools/platforms/MacPlatform.hx" />
<target name="tvos" path="tools/platforms/TVOSPlatform.hx" />
<target name="windows" path="tools/platforms/WindowsPlatform.hx" />

</section>

<section unless="display">

<section if="cpp ${${haxe_ver} < 3.3}" unless="static_link">
<ndll name="std" haxelib="hxcpp" />
<ndll name="regexp" haxelib="hxcpp" />
<ndll name="zlib" haxelib="hxcpp" unless="emscripten || ios || tvos" />
</section>

<ndll name="lime" if="native" unless="lime-console static_link || lime-switch static_link" />

<dependency name="extension-api" path="dependencies/extension-api" if="android" />
<dependency path="dependencies/howler.min.js" if="html5 howlerjs" />
<dependency path="dependencies/pako.min.js" if="html5" />
Expand All @@ -89,34 +89,34 @@
<dependency path="dependencies/angle/d3dcompiler_47.dll" if="windows angle" unless="static_link" />
<dependency path="dependencies/angle/libegl.dll" if="windows angle" unless="static_link" />
<dependency path="dependencies/angle/libglesv2.dll" if="windows angle" unless="static_link" />

<define name="native-trace" if="flash" unless="haxe-trace || haxetrace" />
<define name="fdb" if="flash debug" unless="nofdb" />

<define name="MACOSX_DEPLOYMENT_TARGET" value="10.9" if="mac" unless="MACOSX_DEPLOYMENT_TARGET" />
<setenv name="MACOSX_DEPLOYMENT_TARGET" value="${MACOSX_DEPLOYMENT_TARGET}" if="mac" />

<architecture name="armv7" if="android" />

<section if="emscripten">

<dependency name="pthread" />
<dependency name="openal" if="lime-openal" />

</section>

<section if="lime-modular">

<set name="haxe-module-name" value="haxe" unless="haxe-module-name" />
<set name="lime-module-name" value="lime" unless="lime-module-name" />
<setenv name="HAXE_STD_PATH" value="${HAXE_STD_PATH}" if="HAXE_STD_PATH" />

<module name="${haxe-module-name}" if="html5" unless="exclude-haxe-module">

<!--<source path="${HAXE_STD_PATH}" package="js.html" />-->
<source path="${HAXE_STD_PATH}" package="haxe.ds" exclude="haxe.ds.StringMap" />
<source path="${HAXE_STD_PATH}" package="haxe.io" />

<class name="haxe.CallStack" />
<class name="haxe.Log" />
<class name="haxe.Timer" />
Expand All @@ -138,7 +138,7 @@
<class name="StringBuf" />
<class name="StringTools" />
<!-- <class name="Type" /> -->

<include type="haxe.ds._StringMap.StringMapIterator" />
<include type="haxe.ds.TreeNode" />
<!-- <include type="haxe.IMap" /> -->
Expand All @@ -147,21 +147,21 @@
<include type="js.html._CanvasElement.CanvasUtil" />
<!-- <include type="js._Boot.HaxeError" /> -->
<include type="_List.ListIterator" />

</module>

<module name="${lime-module-name}" if="html5" unless="exclude-lime-module">

<source path="" package="lime" exclude="lime._backend.*|lime.project.*|lime.tools.*|lime.net.*|lime.graphics.console.*|lime.text.harfbuzz.*" />
<source path="" package="lime" include="lime._backend.html5" />

<class name="lime.net.HTTPRequest" />

<include type="lime.app._Future.FutureWork" />
<include type="lime.graphics.utils._ImageDataUtil.ImageDataView" />
<include type="lime.system._ThreadPool.ThreadPoolMessageType" />
<include type="lime.AssetLibrary" />

<!-- @:expose on enums do not work in Haxe 3.4.2 -->
<class remove="lime.graphics.opengl.GLContextType" />
<class remove="lime.graphics.ImageChannel" />
Expand All @@ -171,7 +171,7 @@
<class remove="lime.ui.MouseCursor" />
<class remove="lime.system.Endian" />
<class remove="lime.system.SensorType" />

<exclude type="lime.graphics.console.IndexBuffer" />
<exclude type="lime.graphics.console.PointerUtil" />
<exclude type="lime.graphics.console.Primitive" />
Expand All @@ -185,24 +185,24 @@
<exclude type="lime.graphics.console.VertexBuffer" />
<exclude type="lime.graphics.console.VertexDecl" />
<exclude type="lime.graphics.console.VertexOutput" />

</module>

</section>

</section>

<haxelib name="hxcpp" if="setup" />
<haxelib name="lime-samples" if="setup" />

<include haxelib="lime-samples" if="create" />

<section if="rebuild">

<config:project>
<rebuild fulldebug="true" />
</config:project>

</section>

</extension>
Loading

0 comments on commit 78e99bf

Please sign in to comment.