Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 252f8e4

Browse files
author
Ali Lloyd
committed
Merge branch 'refactor-syntax_unicode' of https://github.com/runrev/livecode into refactor-syntax_unicode_with_develop_again
Conflicts: engine/engine.xcodeproj/project.pbxproj engine/src/cmdse.cpp engine/src/deploy_macosx.cpp engine/src/image_rep_encoded.cpp engine/src/mblandroiddc.cpp engine/src/mblandroidfont.cpp engine/src/mbliphonedc.mm engine/src/mbliphoneembedded.mm engine/src/object.cpp engine/src/stacke.cpp engine/src/util.cpp
2 parents 7ff10a4 + 220c1fe commit 252f8e4

File tree

168 files changed

+6493
-2683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+6493
-2683
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ xcuserdata/
7676
*.suo
7777
*.mode1v3
7878
*.xcworkspacedata
79+
*.creator.user
7980

8081

8182
# Build folders #

‎Livecode.config‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// ADD PREDEFINED MACROS HERE!
2+
3+
#define X11
4+
#define TARGET_PLATFORM_LINUX
5+
#define TARGET_PLATFORM_POSIX
6+
#define _LINUX
7+
#define LINUX
8+
#define _LINUX_DESKTOP
9+
#define GTKTHEME
10+
#define HAVE___THREAD
11+
#define MCSSL
12+
#define MODE_DEVELOPMENT
13+
#define FEATURE_PROPERTY_LISTENER
14+
#define FEATURE_MPLAYER
15+
#define PLATFORM_STRING "Linux"
16+
#define _HAS_VSNPRINTF
17+
#define _DEBUG

‎Livecode.creator‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[General]

0 commit comments

Comments
 (0)