Skip to content

Commit 1bf3309

Browse files
author
Fraser J. Gordon
committed
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode_handler_exec
Conflicts: engine/src/debug.cpp engine/src/debug.h engine/src/exec-engine.cpp engine/src/handler.cpp engine/src/scriptpt.cpp engine/src/scriptpt.h engine/src/statemnt.cpp engine/src/variable.cpp
2 parents 745fa98 + 8ec9253 commit 1bf3309

251 files changed

Lines changed: 14241 additions & 14338 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ stacksecurity_encrypted.cpp
1919

2020
# Compiled source #
2121
###################
22+
*.i
23+
*.ii
2224
*.com
2325
*.class
2426
*.dll
@@ -70,6 +72,7 @@ xcuserdata/
7072
*.suo
7173
*.mode1v3
7274
*.xcworkspacedata
75+
*.creator.user
7376

7477

7578
# 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)