gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into new-editors

Browse Source
This commit is contained in:
Ne_Eo
2024-08-16 17:57:36 +02:00
parent 5fea56c618 66da9eaac0
commit 03e262ef31
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs.xml
+6 -4
View File
@@ -5,7 +5,8 @@
<!-- OpenFL & Lime (Required for Flixel) -->
<git name="openfl" url="https://github.com/FNF-CNE-Devs/openfl" />
<git name="lime" url="https://github.com/FNF-CNE-Devs/lime" />
<lib name="lime" version="8.1.2" />
<!-- <git name="lime" url="https://github.com/FNF-CNE-Devs/lime" /> disabled for now until fixed -->
<!-- Flixel -->
<git name="flixel" url="https://github.com/FNF-CNE-Devs/flixel" />
@@ -41,11 +42,12 @@
</if>
<!-- Lime Building -->
<if cond="build-lime || all">
<!-- <if cond="build-lime || all">
<print pretty="true">Rebuilding Lime...</print>
<!-- Build lime -->
<!- - Build lime - ->
<cmd inLib="lime" cmd="haxelib run lime rebuild . $PLATFORM -clean" />
<cmd inLib="lime" dir="tools" cmd="haxe tools.hxml" />
</if>
</if> -->
</libraries>
setup-dev-branch.xml
+5 -5
View File
@@ -2,7 +2,7 @@
<libraries checkVersion="false">
<if cond="time-fix">
<print pretty="true">Switching to branch 'time-fix'...</print>
<cmd inLib="lime" cmd="git checkout time-fix" />
<!-- <cmd inLib="lime" cmd="git checkout time-fix" /> -->
<cmd inLib="openfl" cmd="git checkout time-fix" />
<cmd inLib="away3d" cmd="git checkout time-fix" />
<cmd inLib="flixel" cmd="git checkout time-fix" />
@@ -12,7 +12,7 @@
<if cond="normal">
<print pretty="true">Switching to branch 'dev'...</print>
<cmd inLib="lime" cmd="git checkout develop" />
<!-- <cmd inLib="lime" cmd="git checkout develop" /> -->
<cmd inLib="openfl" cmd="git checkout develop" />
<cmd inLib="away3d" cmd="git checkout master" />
<cmd inLib="flixel" cmd="git checkout dev" />
@@ -20,7 +20,7 @@
<print pretty="true">Done!&#10;Make sure to switch the branch on Codename Engine to 'main' before compiling!</print>
</if>
<print pretty="true">Rebuilding Lime...</print>
<cmd inLib="lime" cmd="haxelib run lime rebuild . $PLATFORM -clean" />
<cmd inLib="lime" dir="tools" cmd="haxe tools.hxml" />
<!-- <print pretty="true">Rebuilding Lime...</print> -->
<!-- <cmd inLib="lime" cmd="haxelib run lime rebuild . $PLATFORM -clean" /> -->
<!-- <cmd inLib="lime" dir="tools" cmd="haxe tools.hxml" /> -->
</libraries>
setup-dev.xml
+3 -3
View File
@@ -27,7 +27,7 @@
</cmd>
</if>
<if cond="lime || all">
<!-- <if cond="lime || all">
<cmd>
<line>cd dev-libs</line>
<line>git clone https://github.com/FNF-CNE-Devs/lime lime</line>
@@ -35,10 +35,10 @@
<line>haxelib dev lime dev-libs/lime</line>
</cmd>
<!-- Build lime -->
<!- - Build lime - ->
<cmd inLib="lime" cmd="haxelib run lime rebuild . $PLATFORM -clean" />
<cmd inLib="lime" dir="tools" cmd="haxe tools.hxml" />
</if>
</if> -->
<if cond="flixel || all">
<cmd>