diff --git a/FindPanel/Controllers/OgreAdvancedFindPanelController.h b/FindPanel/Controllers/OgreAdvancedFindPanelController.h
index d4668f19..4e71ca50 100755
--- a/FindPanel/Controllers/OgreAdvancedFindPanelController.h
+++ b/FindPanel/Controllers/OgreAdvancedFindPanelController.h
@@ -196,4 +196,6 @@
- (BOOL)inSelectionScopeOption;
- (void)setInSelectionScopeOption:(BOOL)inSelectionScopeOption;
+- (NSString*)version;
+
@end
diff --git a/FindPanel/Controllers/OgreAdvancedFindPanelController.m b/FindPanel/Controllers/OgreAdvancedFindPanelController.m
index 0a79a637..ceb5f094 100755
--- a/FindPanel/Controllers/OgreAdvancedFindPanelController.m
+++ b/FindPanel/Controllers/OgreAdvancedFindPanelController.m
@@ -327,7 +327,9 @@ - (void)restoreHistory:(NSDictionary*)history
if (start == contentsEnd) {
[item setTitle:@""];
} else {
- [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]];
+// [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]];
+ // スタイルを削除する
+ [item setTitle:[[attrString string] substringWithRange:NSMakeRange(start, contentsEnd - start)]];
}
[item setTarget:self];
[item setAction:@selector(selectReplaceHistory:)];
@@ -375,7 +377,12 @@ - (void)restoreHistory:(NSDictionary*)history
if (start == contentsEnd) {
[item setTitle:@""];
} else {
- [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]];
+ if ([self replaceWithStylesOption]) {
+ [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]];
+ } else {
+ // スタイルを削除する
+ [item setTitle:[[attrString string] substringWithRange:NSMakeRange(start, contentsEnd - start)]];
+ }
}
[item setTarget:self];
[item setAction:@selector(selectReplaceHistory:)];
@@ -573,7 +580,9 @@ - (void)addFindHistory:(NSAttributedString*)attrString
if (start == contentsEnd) {
[item setTitle:@""];
} else {
- [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]];
+// [item setAttributedTitle:[attrString attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]];
+ // スタイルは削除する。
+ [item setTitle:[string substringWithRange:NSMakeRange(start, contentsEnd - start)]];
}
[item setTarget:self];
[item setAction:@selector(selectFindHistory:)];
@@ -612,7 +621,12 @@ - (void)addReplaceHistory:(NSAttributedString*)string
if (start == contentsEnd) {
[item setTitle:@""];
} else {
- [item setAttributedTitle:[string attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]];
+ if ([self replaceWithStylesOption]) {
+ [item setAttributedTitle:[string attributedSubstringFromRange:NSMakeRange(start, contentsEnd - start)]];
+ } else {
+ // スタイルを削除する
+ [item setTitle:[[string string] substringWithRange:NSMakeRange(start, contentsEnd - start)]];
+ }
}
[item setTarget:self];
[item setAction:@selector(selectReplaceHistory:)];
@@ -1676,6 +1690,11 @@ - (void)setInSelectionScopeOption:(BOOL)anInSelectionScopeOption
inSelectionScopeOption = anInSelectionScopeOption;
}
+- (NSString*)version
+{
+ return [OGRegularExpression version];
+}
+
/* delegate methods of findTextView/replaceTextView */
- (BOOL)textView:(NSTextView*)aTextView shouldChangeTextInRange:(NSRange)affectedCharRange replacementString:(NSString*)replacementString
{
diff --git a/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/designable.nib
index 1b2b013e..6b66aeaa 100644
--- a/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -512,7 +512,7 @@
diff --git a/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index bff7aba9..93cf3348 100644
Binary files a/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/Base.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/designable.nib
index dabb81c6..77162f3d 100644
--- a/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -494,6 +494,7 @@
+
@@ -510,7 +511,7 @@
@@ -939,6 +965,7 @@
+
diff --git a/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index 2737abf9..fefdb4c7 100644
Binary files a/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/Dutch.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/designable.nib
index 46ab0b0f..41ca13a9 100644
--- a/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -511,7 +511,7 @@
-
+
+
diff --git a/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index 2077154b..094e00ad 100644
Binary files a/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/French.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/FindPanel/Resources/German.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/German.lproj/OgreAdvancedFindPanel.nib/designable.nib
index cb07487d..20e831bb 100644
--- a/FindPanel/Resources/German.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/German.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -511,7 +511,7 @@
-
+
+
diff --git a/FindPanel/Resources/German.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/German.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index 75fc7178..89b241af 100644
Binary files a/FindPanel/Resources/German.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/German.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/FindPanel/Resources/Italian.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Italian.lproj/OgreAdvancedFindPanel.nib/designable.nib
index 2db03bda..bba4f689 100644
--- a/FindPanel/Resources/Italian.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/Italian.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -494,7 +494,7 @@
-
+
@@ -511,7 +511,7 @@
-
+
diff --git a/FindPanel/Resources/Italian.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Italian.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index 6da513a3..93e52c61 100644
Binary files a/FindPanel/Resources/Italian.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/Italian.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/FindPanel/Resources/Japanese.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Japanese.lproj/OgreAdvancedFindPanel.nib/designable.nib
index 7fd237ff..db9fa2e5 100644
--- a/FindPanel/Resources/Japanese.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/Japanese.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -530,7 +530,7 @@
diff --git a/FindPanel/Resources/Japanese.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Japanese.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index 66155eb4..c82a56ed 100644
Binary files a/FindPanel/Resources/Japanese.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/Japanese.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/FindPanel/Resources/Portuguese.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Portuguese.lproj/OgreAdvancedFindPanel.nib/designable.nib
index bc1f51e5..3b4e140f 100644
--- a/FindPanel/Resources/Portuguese.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/Portuguese.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -511,7 +511,7 @@
@@ -940,6 +965,7 @@
+
diff --git a/FindPanel/Resources/Portuguese.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Portuguese.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index bf634680..44c7501c 100644
Binary files a/FindPanel/Resources/Portuguese.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/Portuguese.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/FindPanel/Resources/Romanian.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Romanian.lproj/OgreAdvancedFindPanel.nib/designable.nib
index f161dc6e..d3611738 100644
--- a/FindPanel/Resources/Romanian.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/Romanian.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -511,7 +511,7 @@
diff --git a/FindPanel/Resources/Romanian.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Romanian.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index 26f6bd08..052caa1c 100644
Binary files a/FindPanel/Resources/Romanian.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/Romanian.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/FindPanel/Resources/Spanish.lproj/OgreAdvancedFindPanel.nib/designable.nib b/FindPanel/Resources/Spanish.lproj/OgreAdvancedFindPanel.nib/designable.nib
index a039550d..ffae2d72 100644
--- a/FindPanel/Resources/Spanish.lproj/OgreAdvancedFindPanel.nib/designable.nib
+++ b/FindPanel/Resources/Spanish.lproj/OgreAdvancedFindPanel.nib/designable.nib
@@ -511,7 +511,7 @@
diff --git a/FindPanel/Resources/Spanish.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib b/FindPanel/Resources/Spanish.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib
index 0ec26fed..d7f51ee1 100644
Binary files a/FindPanel/Resources/Spanish.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib and b/FindPanel/Resources/Spanish.lproj/OgreAdvancedFindPanel.nib/keyedobjects.nib differ
diff --git a/OgreKit.xcodeproj/project.pbxproj b/OgreKit.xcodeproj/project.pbxproj
index 76b2fafc..7ba4a13d 100644
--- a/OgreKit.xcodeproj/project.pbxproj
+++ b/OgreKit.xcodeproj/project.pbxproj
@@ -1765,7 +1765,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1000;
+ LastUpgradeCheck = 1010;
};
buildConfigurationList = 4DC40BA3091509DC0029A2A6 /* Build configuration list for PBXProject "OgreKit" */;
compatibilityVersion = "Xcode 3.2";
@@ -2347,7 +2347,7 @@
4D82DCD609B9ECF8007F03B0 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -2362,7 +2362,7 @@
4D82DCD709B9ECF8007F03B0 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -2376,7 +2376,7 @@
4D82DCD809B9ECF8007F03B0 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_NAME = Oniguruma;
@@ -2388,7 +2388,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -2415,7 +2415,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2442,7 +2442,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2465,7 +2465,7 @@
4DC40BA0091509DC0029A2A6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2510,7 +2510,7 @@
4DC40BA1091509DC0029A2A6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2553,7 +2553,7 @@
4DC40BA2091509DC0029A2A6 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -2704,7 +2704,7 @@
4DC40BF909150BDB0029A2A6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2749,7 +2749,7 @@
4DC40BFA09150BDB0029A2A6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2792,7 +2792,7 @@
4DC40BFB09150BDB0029A2A6 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -2833,7 +2833,7 @@
4DC40C0809150C290029A2A6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2865,7 +2865,7 @@
4DC40C0909150C290029A2A6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -2897,7 +2897,7 @@
4DC40C0A09150C290029A2A6 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
@@ -2928,7 +2928,7 @@
4DC40C1309150C400029A2A6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2957,7 +2957,7 @@
4DC40C1409150C400029A2A6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -2986,7 +2986,7 @@
4DC40C1509150C400029A2A6 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
@@ -3014,7 +3014,7 @@
4DC40C1E09150C740029A2A6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -3043,7 +3043,7 @@
4DC40C1F09150C740029A2A6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -3072,7 +3072,7 @@
4DC40C2009150C740029A2A6 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
@@ -3100,7 +3100,7 @@
4DC40C3409150C9F0029A2A6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -3133,7 +3133,7 @@
4DC40C3509150C9F0029A2A6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -3166,7 +3166,7 @@
4DC40C3609150C9F0029A2A6 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
@@ -3198,7 +3198,7 @@
4DC412C3091519D50029A2A6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -3221,7 +3221,7 @@
4DC412C4091519D50029A2A6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -3244,7 +3244,7 @@
4DC412C5091519D50029A2A6 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_WEAK = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_OPTIMIZATION_LEVEL = 0;
MACOSX_DEPLOYMENT_TARGET = 10.12;
diff --git a/README.md b/README.md
index b4cac914..78acebc7 100644
--- a/README.md
+++ b/README.md
@@ -5,3 +5,19 @@
* **Japanese Site:** http://sonoisa.github.com/ogrekit/About.html
* **English Site:** http://sonoisa.github.com/ogrekit/About_%28English%29.html
+
+
+## How to build OgreKit framework
+
+The following steps is for "OgreKit (Full Features)". For "OgreKit (Without Find Panel)", you can build it by replacing "Full Features" with "Without Find Panel" in the steps.
+
+1. Open OgreKit.xcodeproj in XCode.
+1. Select the "OgreKit (Full Features)" scheme.
+ * i.e., in the menu bar, select "Product" -> "Scheme" -> "OgreKit (Full Features)".
+1. Build it for running
+ * i.e., in the menu bar, select "Product" -> "Build For" -> "Running".
+1. Find OgreKit framework file in the Finder.
+ * i.e., in the menu bar, select "View" -> "Navigators" -> "Show Project Navigator".
+ * In the Project Navigator, Select "OgreKit.framework" file in "Products" folder.
+ * In the menu bar, select "File" -> "Show in Finder".
+ * Then you can see "OgreKit.framework" file in the "Release" folder.
diff --git a/RegularExpression/English.lproj/InfoPlist.strings b/RegularExpression/English.lproj/InfoPlist.strings
index e656c0d1..665659dd 100755
--- a/RegularExpression/English.lproj/InfoPlist.strings
+++ b/RegularExpression/English.lproj/InfoPlist.strings
@@ -12,6 +12,6 @@
*/
CFBundleName = "OgreKit";
-CFBundleShortVersionString = "OgreKit version 3.0.1";
-CFBundleGetInfoString = "OgreKit version 3.0.1, Copyright (c) 2004-2018 Isao Sonobe.";
+CFBundleShortVersionString = "OgreKit version 3.0.2";
+CFBundleGetInfoString = "OgreKit version 3.0.2, Copyright (c) 2004-2018 Isao Sonobe.";
NSHumanReadableCopyright = "Copyright (c) 2004-2018 Isao Sonobe.";
diff --git a/RegularExpression/OGRegularExpression.h b/RegularExpression/OGRegularExpression.h
index 8bf88f82..5ea90c01 100755
--- a/RegularExpression/OGRegularExpression.h
+++ b/RegularExpression/OGRegularExpression.h
@@ -24,7 +24,7 @@
/* constants */
// version string
-#define OgreVersionString @"3.0.1"
+#define OgreVersionString @"3.0.2"
// compile time options:
extern const unsigned OgreNoneOption;
diff --git a/RegularExpression/configure.sh b/RegularExpression/configure.sh
deleted file mode 100755
index 3cbe4859..00000000
--- a/RegularExpression/configure.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-if [ -e "RegularExpression/oniguruma" ]; then
- echo "oniguruma already exists."
-else
- echo "oniguruma is not found. Extracting oniguruma..."
- cd RegularExpression
- tar zxvf onigd20050823.tar.gz
-
-# if false; then
-# echo "Applying patch..."
-# cp 20040720.patch oniguruma/.
-# cd oniguruma
-# cp regparse.c regparse.c.original
-# cp regcomp.c regcomp.c.original
-# patch -p0 < 20040720.patch
-# cd ..
-# fi
-
- cd ..
-fi
-
-if [ -e "RegularExpression/oniguruma/config.h" ]; then
- echo "config.h already exists."
-else
- echo "config.h is not found. Creating config.h..."
- cd RegularExpression/oniguruma
- ./configure
-fi
-
-exit
-
-# Name: configure.sh
-# Project: OgreKit
-#
-# Creation Date: Sep 7 2003
-# Author: Isao Sonobe
-# Copyright: Copyright (c) 2003 Isao Sonobe, All rights reserved.
-# License: OgreKit License
-#
-# Tabsize: 4
-