Skip to content

Commit 62b9f32

Browse files
peter-bpeter-b
committed
Merge branch 'develop-7.0' into develop
2 parents c7438d4 + 7e5741d commit 62b9f32

Some content is hidden

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

44 files changed

+56
-958
lines changed

‎configure.bat‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,15 @@ IF EXIST "%programfiles(x86)%\Microsoft Speech SDK\*" (
7171
REM Pause so any warnings can be seen
7272
IF %warnings% NEQ 0 PAUSE
7373

74+
REM Community or commercial?
75+
IF /I %BUILD_EDITION% == commercial (
76+
SET gypfile="../livecode-commercial.gyp"
77+
)
78+
7479
REM Run the configure step
75-
%python% gyp\gyp_main.py --format msvs --depth . --generator-output build-win-x86/livecode -Gmsvs_version=2010 %extra_options%
80+
%python% gyp\gyp_main.py --format msvs --depth . --generator-output build-win-x86/livecode -Gmsvs_version=2010 %extra_options% %gypfile%
81+
PAUSE
7682

7783
REM Pause if there was an error so that the user gets a chance to see it
7884
IF %ERRORLEVEL% NEQ 0 PAUSE
7985
EXIT %ERRORLEVEL%
80-

‎docs/notes/bugfix-15597.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# LiveCode 7 fail to export valid RTF text if lists are used

‎docs/notes/bugfix-15648.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Exporting text to RTF text generates invalid output if there is the backgroundcolor has been changed

‎docs/notes/bugfix-15654.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# LiveCode 6.7.7 RC 1 / 7.1.0 DP 1 won't install on 10.6.8

‎engine/engine-sources.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
'src/card.h',
184184
'src/cardlst.h',
185185
'src/cdata.h',
186-
'src/control.h',
186+
'src/mccontrol.h',
187187
'src/cpalette.h',
188188
'src/dispatch.h',
189189
'src/edittool.h',

‎engine/kernel.gypi‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,22 @@
9696
'libraries':
9797
[
9898
'$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
99-
'$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
10099
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
101100
'$(SDKROOT)/System/Library/Frameworks/CoreMedia.framework',
102101
'$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
103102
'$(SDKROOT)/System/Library/Frameworks/Security.framework',
104103
'$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
105104
],
105+
106+
# Adding AVFoundation in the list of libraries does not allow
107+
# us to weak link it. Only adding the linking flag does the job
108+
'xcode_settings':
109+
{
110+
'OTHER_LDFLAGS':
111+
[
112+
'-weak_framework AVFoundation',
113+
]
114+
},
106115
},
107116
],
108117
[

‎engine/src/button.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
1717
#ifndef BUTTON_H
1818
#define BUTTON_H
1919

20-
#include "control.h"
20+
#include "mccontrol.h"
2121

2222

2323
#define AQUA_FUDGE 8

‎engine/src/cmdsc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
3030
#include "undolst.h"
3131
#include "chunk.h"
3232
#include "object.h"
33-
#include "control.h"
33+
#include "mccontrol.h"
3434
#include "mcerror.h"
3535
#include "dispatch.h"
3636
#include "stack.h"

‎engine/src/cmdsf.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
3232
#include "chunk.h"
3333
#include "mcerror.h"
3434
#include "object.h"
35-
#include "control.h"
35+
#include "mccontrol.h"
3636
#include "aclip.h"
3737
#include "vclip.h"
3838
#include "eps.h"

‎engine/src/control.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
2727
#include "stack.h"
2828
#include "tooltip.h"
2929
#include "card.h"
30-
#include "control.h"
30+
#include "mccontrol.h"
3131
#include "group.h"
3232
#include "field.h"
3333
#include "scrolbar.h"

0 commit comments

Comments
 (0)