Skip to content

Commit a279170

Browse files
runrevmarkrunrevmark
committed
Tweaked Mac desktop project and global xcconfig to use system default compiler.
Fixed compilation of installer related files.
1 parent da7be62 commit a279170

4 files changed

Lines changed: 4 additions & 55 deletions

File tree

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@
309309
4D4F9E3B13CDF24A00B9B15D /* osximage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F9E3913CDF24A00B9B15D /* osximage.cpp */; };
310310
4D4F9E3C13CDF24A00B9B15D /* osxmisc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F9E3A13CDF24A00B9B15D /* osxmisc.cpp */; };
311311
4D4F9E6713CDFB8100B9B15D /* osxfield.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F9E6613CDFB8100B9B15D /* osxfield.cpp */; };
312+
4D56632017D9CD1E00C4A0B1 /* libfoundation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7FA7BB1594E0FA00EEF440 /* libfoundation.a */; };
312313
4D5880860B80BDF000200116 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5880850B80BDF000200116 /* QuickTime.framework */; };
313314
4D5881210B80BF1E00200116 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5881200B80BF1E00200116 /* IOKit.framework */; };
314315
4D58856B0B80DEAC00200116 /* da.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 4D58854C0B80DEAB00200116 /* da.lproj */; };
@@ -1611,6 +1612,7 @@
16111612
isa = PBXFrameworksBuildPhase;
16121613
buildActionMask = 2147483647;
16131614
files = (
1615+
4D56632017D9CD1E00C4A0B1 /* libfoundation.a in Frameworks */,
16141616
4D2A57C41198634300135143 /* libkernel.a in Frameworks */,
16151617
4D1F9C53171C662D0091C6CB /* libsecurity-community.a in Frameworks */,
16161618
4DB384BE1714420A00D3F102 /* libz.a in Frameworks */,
@@ -3951,26 +3953,20 @@
39513953
4D1F9C2F171C64320091C6CB /* Debug */ = {
39523954
isa = XCBuildConfiguration;
39533955
buildSettings = {
3954-
COMBINE_HIDPI_IMAGES = YES;
3955-
GCC_VERSION = "";
39563956
PRODUCT_NAME = "security-community";
39573957
};
39583958
name = Debug;
39593959
};
39603960
4D1F9C30171C64320091C6CB /* Release */ = {
39613961
isa = XCBuildConfiguration;
39623962
buildSettings = {
3963-
COMBINE_HIDPI_IMAGES = YES;
3964-
GCC_VERSION = "";
39653963
PRODUCT_NAME = "security-community";
39663964
};
39673965
name = Release;
39683966
};
39693967
4D1F9D15171C67B00091C6CB /* Debug */ = {
39703968
isa = XCBuildConfiguration;
39713969
buildSettings = {
3972-
COMBINE_HIDPI_IMAGES = YES;
3973-
GCC_VERSION = "";
39743970
GLOBAL_GCC_PREPROCESSOR_DEFINITIONS = "_SERVER _MAC_SERVER";
39753971
PRODUCT_NAME = "kernel-server";
39763972
};
@@ -3979,8 +3975,6 @@
39793975
4D1F9D16171C67B00091C6CB /* Release */ = {
39803976
isa = XCBuildConfiguration;
39813977
buildSettings = {
3982-
COMBINE_HIDPI_IMAGES = YES;
3983-
GCC_VERSION = "";
39843978
GLOBAL_GCC_PREPROCESSOR_DEFINITIONS = "_SERVER _MAC_SERVER";
39853979
PRODUCT_NAME = "kernel-server";
39863980
};
@@ -3989,90 +3983,68 @@
39893983
4D221A9F171D58A800E7E557 /* Debug */ = {
39903984
isa = XCBuildConfiguration;
39913985
buildSettings = {
3992-
COMBINE_HIDPI_IMAGES = YES;
39933986
GCC_PREPROCESSOR_DEFINITIONS = (
39943987
"$(inherited)",
39953988
MODE_DEVELOPMENT,
39963989
);
3997-
GCC_VERSION = "";
39983990
PRODUCT_NAME = "kernel-development";
39993991
};
40003992
name = Debug;
40013993
};
40023994
4D221AA0171D58A800E7E557 /* Release */ = {
40033995
isa = XCBuildConfiguration;
40043996
buildSettings = {
4005-
COMBINE_HIDPI_IMAGES = YES;
40063997
GCC_PREPROCESSOR_DEFINITIONS = (
40073998
"$(inherited)",
40083999
MODE_DEVELOPMENT,
40094000
);
4010-
GCC_VERSION = "";
40114001
PRODUCT_NAME = "kernel-development";
40124002
};
40134003
name = Release;
40144004
};
40154005
4D221AF4171D5EC500E7E557 /* Debug */ = {
40164006
isa = XCBuildConfiguration;
40174007
buildSettings = {
4018-
COMBINE_HIDPI_IMAGES = YES;
40194008
GCC_PREPROCESSOR_DEFINITIONS = (
40204009
"$(inherited)",
40214010
MODE_DEVELOPMENT,
40224011
);
4023-
GCC_VERSION = "";
40244012
PRODUCT_NAME = "kernel-standalone";
40254013
};
40264014
name = Debug;
40274015
};
40284016
4D221AF5171D5EC500E7E557 /* Release */ = {
40294017
isa = XCBuildConfiguration;
40304018
buildSettings = {
4031-
COMBINE_HIDPI_IMAGES = YES;
40324019
GCC_PREPROCESSOR_DEFINITIONS = (
40334020
"$(inherited)",
40344021
MODE_DEVELOPMENT,
40354022
);
4036-
GCC_VERSION = "";
40374023
PRODUCT_NAME = "kernel-standalone";
40384024
};
40394025
name = Release;
40404026
};
40414027
4D222011171D72A500E7E557 /* Debug */ = {
40424028
isa = XCBuildConfiguration;
40434029
buildSettings = {
4044-
COMBINE_HIDPI_IMAGES = YES;
4045-
GCC_VERSION = "";
4046-
"GCC_VERSION[sdk=macosx10.4]" = "";
4047-
MACH_O_TYPE = mh_execute;
4048-
MACOSX_DEPLOYMENT_TARGET = 10.4;
40494030
PRODUCT_NAME = version;
40504031
};
40514032
name = Debug;
40524033
};
40534034
4D222012171D72A500E7E557 /* Release */ = {
40544035
isa = XCBuildConfiguration;
40554036
buildSettings = {
4056-
COMBINE_HIDPI_IMAGES = YES;
4057-
GCC_VERSION = "";
4058-
"GCC_VERSION[sdk=macosx10.4]" = "";
4059-
MACH_O_TYPE = mh_execute;
4060-
MACOSX_DEPLOYMENT_TARGET = 10.4;
40614037
PRODUCT_NAME = version;
40624038
};
40634039
name = Release;
40644040
};
40654041
4D2A57D41198634300135143 /* Debug */ = {
40664042
isa = XCBuildConfiguration;
40674043
buildSettings = {
4068-
COMBINE_HIDPI_IMAGES = YES;
40694044
GCC_PREPROCESSOR_DEFINITIONS = (
40704045
"$(inherited)",
40714046
MODE_INSTALLER,
40724047
);
4073-
GCC_VERSION = "";
4074-
HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"../libcore/src\"";
4075-
HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SYMROOT)/$(CONFIGURATION)/headers\"";
40764048
INFOPLIST_FILE = "rsrc/Installer-Info.plist";
40774049
PRODUCT_NAME = Installer;
40784050
};
@@ -4081,12 +4053,10 @@
40814053
4D2A57D51198634300135143 /* Release */ = {
40824054
isa = XCBuildConfiguration;
40834055
buildSettings = {
4084-
COMBINE_HIDPI_IMAGES = YES;
40854056
GCC_PREPROCESSOR_DEFINITIONS = (
40864057
"$(inherited)",
40874058
MODE_INSTALLER,
40884059
);
4089-
GCC_VERSION = "";
40904060
INFOPLIST_FILE = "rsrc/Installer-Info.plist";
40914061
PRODUCT_NAME = Installer;
40924062
};
@@ -4096,24 +4066,19 @@
40964066
isa = XCBuildConfiguration;
40974067
baseConfigurationReference = 4D587DB40B80949B00200116 /* Debug.xcconfig */;
40984068
buildSettings = {
4099-
"GCC_VERSION[sdk=macosx10.4]" = "";
41004069
};
41014070
name = Debug;
41024071
};
41034072
4D587D970B80944100200116 /* Release */ = {
41044073
isa = XCBuildConfiguration;
41054074
baseConfigurationReference = 4D587DB20B80949B00200116 /* Release.xcconfig */;
41064075
buildSettings = {
4107-
"GCC_VERSION[sdk=macosx10.4]" = "";
41084076
};
41094077
name = Release;
41104078
};
41114079
4D587DA70B80945B00200116 /* Debug */ = {
41124080
isa = XCBuildConfiguration;
41134081
buildSettings = {
4114-
COMBINE_HIDPI_IMAGES = YES;
4115-
GCC_VERSION = "";
4116-
"GCC_VERSION[sdk=macosx10.4]" = "";
41174082
INFOPLIST_FILE = "rsrc/Revolution-Info.plist";
41184083
PRODUCT_NAME = "LiveCode-Community";
41194084
WRAPPER_EXTENSION = app;
@@ -4123,9 +4088,6 @@
41234088
4D587DA80B80945B00200116 /* Release */ = {
41244089
isa = XCBuildConfiguration;
41254090
buildSettings = {
4126-
COMBINE_HIDPI_IMAGES = YES;
4127-
GCC_VERSION = "";
4128-
"GCC_VERSION[sdk=macosx10.4]" = "";
41294091
INFOPLIST_FILE = "rsrc/Revolution-Info.plist";
41304092
PRODUCT_NAME = "LiveCode-Community";
41314093
WRAPPER_EXTENSION = app;
@@ -4135,8 +4097,6 @@
41354097
4DE18D8F0B82296A0086DB92 /* Debug */ = {
41364098
isa = XCBuildConfiguration;
41374099
buildSettings = {
4138-
COMBINE_HIDPI_IMAGES = YES;
4139-
GCC_VERSION = "";
41404100
INFOPLIST_FILE = "rsrc/Standalone-Info.plist";
41414101
PRODUCT_NAME = "Standalone-Community";
41424102
};
@@ -4145,8 +4105,6 @@
41454105
4DE18D900B82296A0086DB92 /* Release */ = {
41464106
isa = XCBuildConfiguration;
41474107
buildSettings = {
4148-
COMBINE_HIDPI_IMAGES = YES;
4149-
GCC_VERSION = "";
41504108
INFOPLIST_FILE = "rsrc/Standalone-Info.plist";
41514109
PRODUCT_NAME = "Standalone-Community";
41524110
};
@@ -4155,25 +4113,20 @@
41554113
4DEE29F70FDE41C00009423C /* Debug */ = {
41564114
isa = XCBuildConfiguration;
41574115
buildSettings = {
4158-
COMBINE_HIDPI_IMAGES = YES;
4159-
GCC_VERSION = "";
41604116
PRODUCT_NAME = kernel;
41614117
};
41624118
name = Debug;
41634119
};
41644120
4DEE29F90FDE41C00009423C /* Release */ = {
41654121
isa = XCBuildConfiguration;
41664122
buildSettings = {
4167-
COMBINE_HIDPI_IMAGES = YES;
4168-
GCC_VERSION = "";
41694123
PRODUCT_NAME = kernel;
41704124
};
41714125
name = Release;
41724126
};
41734127
4DFD484013BA2843008DB91F /* Debug */ = {
41744128
isa = XCBuildConfiguration;
41754129
buildSettings = {
4176-
GCC_VERSION = "";
41774130
GLOBAL_GCC_PREPROCESSOR_DEFINITIONS = "_SERVER _MAC_SERVER";
41784131
PRODUCT_NAME = "Server-Community";
41794132
};
@@ -4182,7 +4135,6 @@
41824135
4DFD484113BA2843008DB91F /* Release */ = {
41834136
isa = XCBuildConfiguration;
41844137
buildSettings = {
4185-
GCC_VERSION = "";
41864138
GLOBAL_GCC_PREPROCESSOR_DEFINITIONS = "_SERVER _MAC_SERVER";
41874139
PRODUCT_NAME = "Server-Community";
41884140
};

‎engine/src/bsdiff_apply.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ for more details.
1414
You should have received a copy of the GNU General Public License
1515
along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
1616

17-
#include "core.h"
17+
#include "prefix.h"
1818
#include "bsdiff.h"
1919

2020
////////////////////////////////////////////////////////////////////////////////

‎engine/src/mode_installer_osx.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
1616

1717
#include "osxprefix.h"
1818

19-
#include "core.h"
20-
2119
#include "globdefs.h"
2220
#include "filedefs.h"
2321
#include "objdefs.h"

‎rules/Global.xcconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ GLOBAL_GCC_PREPROCESSOR_DEFINITIONS=TARGET_PLATFORM_MACOS_X _MACOSX
1717
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS=NO
1818
ALWAYS_SEARCH_USER_PATHS = NO
1919
MACOSX_DEPLOYMENT_TARGET = 10.4
20-
//GCC_VERSION = 4.2
21-
//GCC_VERSION[sdk=macosx10.4] = 4.0
20+
GCC_VERSION =

0 commit comments

Comments
 (0)