Skip to content

Commit eaf7e8d

Browse files
authored
Merge pull request #9 from williamAtXojo/master
Updated TextInputCanvas for Desktop API 2.0
2 parents e04e605 + 9f5fc84 commit eaf7e8d

24 files changed

+3813
-2553
lines changed

TextInputCanvas.xcodeproj/project.pbxproj

+15-12
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
3DA022902763BB5C0087909B /* PluginMainCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3DA0228E2763BB5C0087909B /* PluginMainCocoa.mm */; };
11+
3DA022912763BB5C0087909B /* PluginMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA0228F2763BB5C0087909B /* PluginMain.cpp */; };
1012
D800BA0C171704E900D8B933 /* rb_plugin_cocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = D800BA0B171704E900D8B933 /* rb_plugin_cocoa.h */; };
11-
D800BA0E171704F300D8B933 /* PluginMainCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = D800BA0D171704F300D8B933 /* PluginMainCocoa.mm */; };
12-
D811CEEC1533A21D00A04328 /* PluginMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D811CEE71533A21D00A04328 /* PluginMain.cpp */; };
1313
D811CEED1533A21D00A04328 /* rb_plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = D811CEE81533A21D00A04328 /* rb_plugin.h */; };
1414
D811CEEE1533A21D00A04328 /* RBCarbonHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = D811CEE91533A21D00A04328 /* RBCarbonHeaders.h */; };
1515
D811CEEF1533A21D00A04328 /* RBCocoaHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = D811CEEA1533A21D00A04328 /* RBCocoaHeaders.h */; };
@@ -25,10 +25,10 @@
2525
/* End PBXBuildFile section */
2626

2727
/* Begin PBXFileReference section */
28+
3DA0228E2763BB5C0087909B /* PluginMainCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginMainCocoa.mm; sourceTree = "<group>"; };
29+
3DA0228F2763BB5C0087909B /* PluginMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginMain.cpp; sourceTree = "<group>"; };
2830
D800BA0B171704E900D8B933 /* rb_plugin_cocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rb_plugin_cocoa.h; sourceTree = "<group>"; };
29-
D800BA0D171704F300D8B933 /* PluginMainCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginMainCocoa.mm; sourceTree = "<group>"; };
3031
D811CEDA1533A20100A04328 /* IDEUtils.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = IDEUtils.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
31-
D811CEE71533A21D00A04328 /* PluginMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginMain.cpp; sourceTree = "<group>"; };
3232
D811CEE81533A21D00A04328 /* rb_plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rb_plugin.h; sourceTree = "<group>"; };
3333
D811CEE91533A21D00A04328 /* RBCarbonHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RBCarbonHeaders.h; sourceTree = "<group>"; };
3434
D811CEEA1533A21D00A04328 /* RBCocoaHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RBCocoaHeaders.h; sourceTree = "<group>"; };
@@ -88,8 +88,8 @@
8888
D811CEE51533A21D00A04328 /* Glue Code */ = {
8989
isa = PBXGroup;
9090
children = (
91-
D811CEE71533A21D00A04328 /* PluginMain.cpp */,
92-
D800BA0D171704F300D8B933 /* PluginMainCocoa.mm */,
91+
3DA0228F2763BB5C0087909B /* PluginMain.cpp */,
92+
3DA0228E2763BB5C0087909B /* PluginMainCocoa.mm */,
9393
);
9494
path = "Glue Code";
9595
sourceTree = "<group>";
@@ -189,6 +189,7 @@
189189
developmentRegion = English;
190190
hasScannedForEncodings = 0;
191191
knownRegions = (
192+
English,
192193
en,
193194
);
194195
mainGroup = D811CECF1533A20100A04328;
@@ -206,11 +207,11 @@
206207
isa = PBXSourcesBuildPhase;
207208
buildActionMask = 2147483647;
208209
files = (
209-
D811CEEC1533A21D00A04328 /* PluginMain.cpp in Sources */,
210-
D800BA0E171704F300D8B933 /* PluginMainCocoa.mm in Sources */,
211210
D87A5B021757F50900F7D7B7 /* main.cpp in Sources */,
212211
D87A5B041757F50900F7D7B7 /* RBXTextInputView.mm in Sources */,
213212
D87A5B051757F50900F7D7B7 /* TextInputCanvas.cpp in Sources */,
213+
3DA022912763BB5C0087909B /* PluginMain.cpp in Sources */,
214+
3DA022902763BB5C0087909B /* PluginMainCocoa.mm in Sources */,
214215
D87A5B071757F50900F7D7B7 /* TextRange.cpp in Sources */,
215216
);
216217
runOnlyForDeploymentPostprocessing = 0;
@@ -238,7 +239,7 @@
238239
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
239240
GCC_WARN_ABOUT_RETURN_TYPE = YES;
240241
GCC_WARN_UNUSED_VARIABLE = YES;
241-
MACOSX_DEPLOYMENT_TARGET = 10.6;
242+
MACOSX_DEPLOYMENT_TARGET = 10.9;
242243
ONLY_ACTIVE_ARCH = YES;
243244
SDKROOT = macosx;
244245
};
@@ -258,27 +259,29 @@
258259
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
259260
GCC_WARN_ABOUT_RETURN_TYPE = YES;
260261
GCC_WARN_UNUSED_VARIABLE = YES;
261-
MACOSX_DEPLOYMENT_TARGET = 10.6;
262+
MACOSX_DEPLOYMENT_TARGET = 10.9;
262263
SDKROOT = macosx;
263264
};
264265
name = Release;
265266
};
266267
D811CEDF1533A20100A04328 /* Debug */ = {
267268
isa = XCBuildConfiguration;
268269
buildSettings = {
269-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
270+
ARCHS = "$(ARCHS_STANDARD)";
270271
EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/src/Exports.exp";
271272
GCC_PREFIX_HEADER = "$(PROJECT_DIR)/sdk/Includes/RBCocoaHeaders.h";
273+
MACOSX_DEPLOYMENT_TARGET = 10.9;
272274
PRODUCT_NAME = "$(TARGET_NAME)";
273275
};
274276
name = Debug;
275277
};
276278
D811CEE01533A20100A04328 /* Release */ = {
277279
isa = XCBuildConfiguration;
278280
buildSettings = {
279-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
281+
ARCHS = "$(ARCHS_STANDARD)";
280282
EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/src/Exports.exp";
281283
GCC_PREFIX_HEADER = "$(PROJECT_DIR)/sdk/Includes/RBCocoaHeaders.h";
284+
MACOSX_DEPLOYMENT_TARGET = 10.9;
282285
PRODUCT_NAME = "$(TARGET_NAME)";
283286
};
284287
name = Release;

0 commit comments

Comments
 (0)