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

bro i have so many changes if i have a merge conflict

Browse Source
This commit is contained in:
Yoshman29
2023-03-23 18:24:31 +01:00
parent d507ebaf9a
commit f62f695134
11 changed files with 127 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Project.xml
+2 -5
View File
@@ -131,8 +131,8 @@
<!-- Comment this out to disable video cutscene support, in case of compilation errors. !-->
<define name="VIDEO_CUTSCENES" unless="web || linux || hl || mac" />
<!-- Comment this out to disable build number on FPS -->
<!-- <define name="SHOW_BUILD_ON_FPS" /> -->
<!-- Comment this out to disable commit number on FPS -->
<define name="SHOW_BUILD_ON_FPS" />
<haxedef name="VIDEO_CUTSCENES" if="VIDEO_CUTSCENES" />
@@ -168,9 +168,6 @@
<haxeflag name="--macro" value="exclude('funkin.updating')" unless="UPDATE_CHECKING"/>
<haxeflag name="--macro" value="exclude('funkin.multitasking')" unless="ALLOW_MULTITASKING"/>
<!-- MACROS & DOCUMENTATION !-->
<haxeflag name="--macro" value="funkin.macros.BuildCounterMacro.getBuildNumber()" />
<haxedef name="HXCPP_CHECK_POINTER" if="release" />
<haxedef name="HXCPP_STACK_LINE" if="release" />
<haxedef name="HXCPP_DEBUG_LINK" if="release" />