8000 Merge branch 'master' of github.com:ChatScript/ChatScript · ChatScript/ChatScript@774a930 · GitHub
[go: up one dir, main page]
Skip to content

Commit 774a930

Browse files
chatscriptnlpchatscriptnlp
committed
Merge branch 'master' of github.com:ChatScript/ChatScript
2 parents 06eea91 + 2342844 commit 774a930

File tree

4 files changed

+989
-903
lines changed

4 files changed

+989
-903
lines changed

‎BINARIES/MacChatScript

92.2 KB
Binary file not shown.

‎NON-WINDOWS NON-C/XCODE/MacChatScript.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
buildSettings = {
385385
ALWAYS_SEARCH_USER_PATHS = NO;
386386
ARCHS = "$(ARCHS_STANDARD)";
387-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
387+
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
388388
CLANG_CXX_LIBRARY = "libc++";
389389
CLANG_ENABLE_MODULES = YES;
390390
CLANG_ENABLE_OBJC_ARC = YES;
@@ -402,7 +402,7 @@
402402
COPY_PHASE_STRIP = NO;
403403
ENABLE_STRICT_OBJC_MSGSEND = YES;
404404
ENABLE_TESTABILITY = YES;
405-
GCC_C_LANGUAGE_STANDARD = gnu99;
405+
GCC_C_LANGUAGE_STANDARD = c11;
406406
GCC_DYNAMIC_NO_PIC = NO;
407407
GCC_NO_COMMON_BLOCKS = YES;
408408
GCC_OPTIMIZATION_LEVEL = 0;
@@ -430,7 +430,7 @@
430430
buildSettings = {
431431
ALWAYS_SEARCH_USER_PATHS = NO;
432432
ARCHS = "$(ARCHS_STANDARD)";
433-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
433+
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
434434
CLANG_CXX_LIBRARY = "libc++";
435435
CLANG_ENABLE_MODULES = YES;
436436
CLANG_ENABLE_OBJC_ARC = YES;
@@ -449,7 +449,7 @@
449449
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
450450
ENABLE_NS_ASSERTIONS = NO;
451451
ENABLE_STRICT_OBJC_MSGSEND = YES;
452-
GCC_C_LANGUAGE_STANDARD = gnu99;
452+
GCC_C_LANGUAGE_STANDARD = c11;
453453
GCC_NO_COMMON_BLOCKS = YES;
454454
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
455455
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -467,9 +467,9 @@
467467
8FB9300F1ACBBC3F00BD7EF2 /* Debug */ = {
468468
isa = XCBuildConfiguration;
469469
buildSettings = {
470-
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
470+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
471471
CLANG_CXX_LIBRARY = "compiler-default";
472-
GCC_C_LANGUAGE_STANDARD = "compiler-default";
472+
GCC_C_LANGUAGE_STANDARD = c11;
473473
GCC_PREPROCESSOR_DEFINITIONS = (
474474
"DISCARDPOSTGRES=1",
475475
"DISCARDMONGO=1",
@@ -481,9 +481,9 @@
481481
8FB930101ACBBC3F00BD7EF2 /* Release */ = {
482482
isa = XCBuildConfiguration;
483483
buildSettings = {
484-
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
484+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
485485
CLANG_CXX_LIBRARY = "compiler-default";
486-
GCC_C_LANGUAGE_STANDARD = "compiler-default";
486+
GCC_C_LANGUAGE_STANDARD = c11;
487487
GCC_PREPROCESSOR_DEFINITIONS = (
488488
"DISCARDPOSTGRES=1",
489489
"DISCARDMONGO=1",

‎NON-WINDOWS NON-C/XCODE/MacChatScript.xcodeproj/xcshareddata/xcschemes/MacChatScript.xcscheme

Lines changed: 85 additions & 0 deletions
+
BlueprintIdentifier = "8FB930061ACBBC3F00BD7EF2"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1340"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17
18+
BuildableName = "MacChatScript"
19+
BlueprintName = "MacChatScript"
20+
ReferencedContainer = "container:MacChatScript.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "YES"
39+
customWorkingDirectory = "${PROJECT_DIR}/../.."
40+
ignoresPersistentStateOnLaunch = "NO"
41+
debugDocumentVersioning = "YES"
42+
debugServiceExtension = "internal"
43+
allowLocationSimulation = "YES">
44+
<BuildableProductRunnable
45+
runnableDebuggingMode = "0">
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "8FB930061ACBBC3F00BD7EF2"
49+
BuildableName = "MacChatScript"
50+
BlueprintName = "MacChatScript"
51+
ReferencedContainer = "container:MacChatScript.xcodeproj">
52+
</BuildableReference>
53+
</BuildableProductRunnable>
54+
<CommandLineArguments>
55+
<CommandLineArgument
56+
argument = "local"
57+
isEnabled = "YES">
58+
</CommandLineArgument>
59+
</CommandLineArguments>
60+
</LaunchAction>
61+
<ProfileAction
62+
buildConfiguration = "Release"
63+
shouldUseLaunchSchemeArgsEnv = "YES"
64+
savedToolIdentifier = ""
65+
useCustomWorkingDirectory = "NO"
66+
debugDocumentVersioning = "YES">
67+
<BuildableProductRunnable
68+
runnableDebuggingMode = "0">
69+
<BuildableReference
70+
BuildableIdentifier = "primary"
71+
BlueprintIdentifier = "8FB930061ACBBC3F00BD7EF2"
72+
BuildableName = "MacChatScript"
73+
BlueprintName = "MacChatScript"
74+
ReferencedContainer = "container:MacChatScript.xcodeproj">
75+
</BuildableReference>
76+
</BuildableProductRunnable>
77+
</ProfileAction>
78+
<AnalyzeAction
79+
buildConfiguration = "Debug">
80+
</AnalyzeAction>
81+
<ArchiveAction
82+
buildConfiguration = "Release"
83+
revealArchiveInOrganizer = "YES">
84+
</ArchiveAction>
85+
</Scheme>

0 commit comments

Comments
 (0)
0