js/CryptoPassphrase
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Disable modules and force category references

Browse source 
Modules do not work well without frameworks.
This commit is contained in:
Jonathan Schleifer 2017-10-16 00:36:46 +02:00
parent 1ff08de875
commit b87b2e8037
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
9 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iOS/AboutController.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
@import UIKit; #import <UIKit/UIKit.h>
@interface AboutController: UIViewController <UIWebViewDelegate> @interface AboutController: UIViewController <UIWebViewDelegate>
@property (nonatomic, retain) IBOutlet UIWebView *webView; @property (nonatomic, retain) IBOutlet UIWebView *webView;

2
iOS/AddSiteController.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
@import UIKit; #import <UIKit/UIKit.h>
#import "MainViewController.h" #import "MainViewController.h"

2
iOS/AppDelegate.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
@import UIKit; #import <UIKit/UIKit.h>
@interface AppDelegate: UIResponder <UIApplicationDelegate> @interface AppDelegate: UIResponder <UIApplicationDelegate>
@property (nonatomic, strong) UIWindow *window; @property (nonatomic, strong) UIWindow *window;

2
iOS/MainViewController.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
@import UIKit; #import <UIKit/UIKit.h>
#import "SiteStorage.h" #import "SiteStorage.h"

2
iOS/ShowDetailsController.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
@import UIKit; #import <UIKit/UIKit.h>
#import "MainViewController.h" #import "MainViewController.h"

1
iOS/ShowDetailsController.m
View file

@ -20,7 +20,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <ObjFW/ObjFW.h>
#import <ObjFW_Bridge/ObjFW_Bridge.h> #import <ObjFW_Bridge/ObjFW_Bridge.h>
#import "ShowDetailsController.h" #import "ShowDetailsController.h"

4
iOS/SiteStorage.m
View file

@ -22,10 +22,6 @@
#import <ObjFW/ObjFW.h> #import <ObjFW/ObjFW.h>
/* For literals and boxing. */
@compatibility_alias NSDictionary OFDictionary;
@compatibility_alias NSNumber OFNumber;
#import "SiteStorage.h" #import "SiteStorage.h"
@interface SiteStorage () @interface SiteStorage ()

11
iOS/main.m
View file

@ -20,8 +20,9 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h>
#import <ObjFW/ObjFW.h> #import <ObjFW/ObjFW.h>
@import UIKit; #import <ObjFW_Bridge/ObjFW_Bridge.h>
#import "AppDelegate.h" #import "AppDelegate.h"
@ -30,6 +31,14 @@
OF_APPLICATION_DELEGATE(OFAppDelegate) OF_APPLICATION_DELEGATE(OFAppDelegate)
void
_references_to_categories_of_ObjFW_Bridge(void)
{
_NSString_OFObject_reference = 1;
_OFArray_NSObject_reference = 1;
_OFString_NSObject_reference = 1;
}
@implementation OFAppDelegate @implementation OFAppDelegate
- (void)applicationDidFinishLaunching - (void)applicationDidFinishLaunching
{ {

16
iOS/scrypt-pwgen.xcodeproj/project.pbxproj
View file

@ -15,7 +15,7 @@
4B2E52EC1DA942840040D091 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B2E52EB1DA942840040D091 /* Assets.xcassets */; }; 4B2E52EC1DA942840040D091 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B2E52EB1DA942840040D091 /* Assets.xcassets */; };
4B2E52EF1DA942840040D091 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B2E52ED1DA942840040D091 /* LaunchScreen.storyboard */; }; 4B2E52EF1DA942840040D091 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B2E52ED1DA942840040D091 /* LaunchScreen.storyboard */; };
4B7D94E71F93C30C00A54081 /* libobjfw.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B7D94E51F93C30C00A54081 /* libobjfw.a */; }; 4B7D94E71F93C30C00A54081 /* libobjfw.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B7D94E51F93C30C00A54081 /* libobjfw.a */; };
4B7D94E81F93C32900A54081 /* libobjfw_brige.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B7D94E41F93C30C00A54081 /* libobjfw_brige.a */; }; 4B7D94E81F93C32900A54081 /* libobjfw_bridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B7D94E41F93C30C00A54081 /* libobjfw_bridge.a */; };
4B82D1151DAAAFCE00F32B2F /* AboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B82D1141DAAAFCE00F32B2F /* AboutController.m */; }; 4B82D1151DAAAFCE00F32B2F /* AboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B82D1141DAAAFCE00F32B2F /* AboutController.m */; };
4BA115D21DA9432D007ED4EA /* LegacyPasswordGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BA115CE1DA9432D007ED4EA /* LegacyPasswordGenerator.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; }; 4BA115D21DA9432D007ED4EA /* LegacyPasswordGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BA115CE1DA9432D007ED4EA /* LegacyPasswordGenerator.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; };
4BA115D31DA9432D007ED4EA /* NewPasswordGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BA115D01DA9432D007ED4EA /* NewPasswordGenerator.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; }; 4BA115D31DA9432D007ED4EA /* NewPasswordGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BA115D01DA9432D007ED4EA /* NewPasswordGenerator.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; };
@ -51,7 +51,7 @@
4B2E52EB1DA942840040D091 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 4B2E52EB1DA942840040D091 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4B2E52EE1DA942840040D091 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 4B2E52EE1DA942840040D091 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4B2E52F01DA942840040D091 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 4B2E52F01DA942840040D091 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4B7D94E41F93C30C00A54081 /* libobjfw_brige.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw_brige.a; path = ObjFW/lib/libobjfw_brige.a; sourceTree = "<group>"; }; 4B7D94E41F93C30C00A54081 /* libobjfw_bridge.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw_bridge.a; path = ObjFW/lib/libobjfw_bridge.a; sourceTree = "<group>"; };
4B7D94E51F93C30C00A54081 /* libobjfw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw.a; path = ObjFW/lib/libobjfw.a; sourceTree = "<group>"; }; 4B7D94E51F93C30C00A54081 /* libobjfw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw.a; path = ObjFW/lib/libobjfw.a; sourceTree = "<group>"; };
4B82D1131DAAAFCE00F32B2F /* AboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutController.h; sourceTree = "<group>"; }; 4B82D1131DAAAFCE00F32B2F /* AboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutController.h; sourceTree = "<group>"; };
4B82D1141DAAAFCE00F32B2F /* AboutController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutController.m; sourceTree = "<group>"; }; 4B82D1141DAAAFCE00F32B2F /* AboutController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutController.m; sourceTree = "<group>"; };
@ -74,7 +74,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
4B7D94E71F93C30C00A54081 /* libobjfw.a in Frameworks */, 4B7D94E71F93C30C00A54081 /* libobjfw.a in Frameworks */,
4B7D94E81F93C32900A54081 /* libobjfw_brige.a in Frameworks */, 4B7D94E81F93C32900A54081 /* libobjfw_bridge.a in Frameworks */,
4BF4ADEA1DA9A3DB0073B995 /* Foundation.framework in Frameworks */, 4BF4ADEA1DA9A3DB0073B995 /* Foundation.framework in Frameworks */,
4BA115D61DA94390007ED4EA /* UIKit.framework in Frameworks */, 4BA115D61DA94390007ED4EA /* UIKit.framework in Frameworks */,
); );
@ -141,7 +141,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
4B7D94E51F93C30C00A54081 /* libobjfw.a */, 4B7D94E51F93C30C00A54081 /* libobjfw.a */,
4B7D94E41F93C30C00A54081 /* libobjfw_brige.a */, 4B7D94E41F93C30C00A54081 /* libobjfw_bridge.a */,
4BF4ADE91DA9A3DB0073B995 /* Foundation.framework */, 4BF4ADE91DA9A3DB0073B995 /* Foundation.framework */,
4BA115D51DA94390007ED4EA /* UIKit.framework */, 4BA115D51DA94390007ED4EA /* UIKit.framework */,
); );
@ -262,7 +262,6 @@
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
@ -296,7 +295,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -310,7 +309,6 @@
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
@ -338,7 +336,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
@ -354,7 +352,6 @@
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = ObjFW/include; HEADER_SEARCH_PATHS = ObjFW/include;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/ObjFW/lib", "$(PROJECT_DIR)/ObjFW/lib",
@ -373,7 +370,6 @@
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = ObjFW/include; HEADER_SEARCH_PATHS = ObjFW/include;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/ObjFW/lib", "$(PROJECT_DIR)/ObjFW/lib",