Skip to content

Commit 33283de

Browse files
committed
trigger macos build
1 parent e6e7eb9 commit 33283de

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- master
7-
#- develop
7+
- develop
88
tags:
99
- "v*"
1010
pull_request:

src/logger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
#pragma once
1919

20-
#if defined(USE_QT)
20+
#if defined(USE_QFILE)
2121
#include <QtLogging>
2222
#define printf qDebug
2323
#define LOGI(...) qInfo(__VA_ARGS__)

tools/mcxz/bin/sync.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ elif [[ "$1" == "-g" ]] ; then
4646
cp $TARGET_MAIN/src/colormap.* $TARGET_EDITOR/src
4747
cp $TARGET_MAIN/src/strhelper.* $TARGET_EDITOR/src
4848
cp $TARGET_MAIN/src/attr.h $TARGET_EDITOR/src
49+
cp $TARGET_MAIN/src/gameui.* $TARGET_EDITOR/src
50+
cp $TARGET_MAIN/src/logger.h $TARGET_EDITOR/src
51+
cp $TARGET_MAIN/src/recorder.* $TARGET_EDITOR/src
52+
cp $TARGET_MAIN/src/shared/FileMem.* $TARGET_EDITOR/src/shared
53+
cp $TARGET_MAIN/src/shared/FileWrap.* $TARGET_EDITOR/src/shared
54+
cp $TARGET_MAIN/src/shared/FrameSet.* $TARGET_EDITOR/src/shared
55+
cp $TARGET_MAIN/src/shared/PngMagic.* $TARGET_EDITOR/src/shared
56+
cp $TARGET_MAIN/src/shared/helper.* $TARGET_EDITOR/src/shared
4957
cp ../chars/out/chars.h $TARGET_EDITOR/src
5058
cp ../chars/out/chars.cpp $TARGET_EDITOR/src
5159
elif [[ "$1" == "-m" ]] ; then
@@ -56,7 +64,7 @@ elif [[ "$1" == "-m" ]] ; then
5664
echo "Backed up $file to $file.bak_$timestamp"
5765
fi
5866
cp $TARGET_MAIN/tests/in/levels2.mapz $TARGET_MAIN/data/levels.mapz
59-
elif [[ "$1" == "-m" ]] ; then
67+
elif [[ "$1" == "-h" ]] ; then
6068
echo "-a copy metadata to editor"
6169
echo "-g copy gamefiles to editor"
6270
echo "-m update mapfile in runtime"

0 commit comments

Comments
 (0)