aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Info.plist4
-rw-r--r--LispREPLController.m4
-rw-r--r--LispSymbol.m2
-rw-r--r--Moxie.xcodeproj/project.pbxproj9
-rw-r--r--MxWorldSettings.m4
-rw-r--r--NSAttributedString+Moxie.m2
6 files changed, 15 insertions, 10 deletions
diff --git a/Info.plist b/Info.plist
index c6f7d1d..402f0c8 100644
--- a/Info.plist
+++ b/Info.plist
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -47,6 +47,8 @@
<string>MOXI</string>
<key>CFBundleVersion</key>
<string>0-dev</string>
+ <key>LSApplicationCategoryType</key>
+ <string>public.app-category.simulation-games</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
diff --git a/LispREPLController.m b/LispREPLController.m
index d8a9f0e..acf6178 100644
--- a/LispREPLController.m
+++ b/LispREPLController.m
@@ -650,8 +650,8 @@ shouldChangeTextInRange: (NSRange)affectedCharRange
forPartialWordRange: (NSRange)charRange
indexOfSelectedItem: (int *)i
{
- NSLog(@"[LispREPLController textView %@ completions: %@ forPartialWordRange: (%d, %d) indexOfSelectedItem: %d]",
- textView, words, charRange.location, charRange.length, *i);
+ NSLog(@"[LispREPLController textView %@ completions: %@ forPartialWordRange: (%u, %u) indexOfSelectedItem: %d]",
+ textView, words, (unsigned)charRange.location, (unsigned)charRange.length, *i);
return words;
}
diff --git a/LispSymbol.m b/LispSymbol.m
index a73a420..0e0f349 100644
--- a/LispSymbol.m
+++ b/LispSymbol.m
@@ -90,7 +90,7 @@ LispSymbol *BIG_NIL = nil;
return result;
}
-- (unsigned)hash
+- (NSUInteger)hash
{
return [[self name] hash];
}
diff --git a/Moxie.xcodeproj/project.pbxproj b/Moxie.xcodeproj/project.pbxproj
index 60fcd66..55f5931 100644
--- a/Moxie.xcodeproj/project.pbxproj
+++ b/Moxie.xcodeproj/project.pbxproj
@@ -715,6 +715,7 @@
284BD82B08554DD700BAB8A9 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DYLIB_CURRENT_VERSION = "";
@@ -748,7 +749,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
+ INSTALL_PATH = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = Moxie;
@@ -766,6 +767,7 @@
284BD82C08554DD700BAB8A9 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
@@ -782,7 +784,7 @@
GCC_WARN_UNKNOWN_PRAGMAS = NO;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
+ INSTALL_PATH = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
@@ -801,6 +803,7 @@
284BD82D08554DD700BAB8A9 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_ENABLE_TRIGRAPHS = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -811,7 +814,7 @@
GCC_WARN_UNKNOWN_PRAGMAS = NO;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
+ INSTALL_PATH = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = Moxie;
diff --git a/MxWorldSettings.m b/MxWorldSettings.m
index 47b3817..ac23930 100644
--- a/MxWorldSettings.m
+++ b/MxWorldSettings.m
@@ -323,7 +323,7 @@
[self removeObjectForKey: @":TEXT-COLOR"];
else {
NSColor *rgbColor;
- float r, g, b, a;
+ CGFloat r, g, b, a;
rgbColor = [aColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
[rgbColor getRed: &r green: &g blue: &b alpha: &a];
@@ -354,7 +354,7 @@
[self removeObjectForKey: @":BACKGROUND-COLOR"];
else {
NSColor *rgbColor;
- float r, g, b, a;
+ CGFloat r, g, b, a;
rgbColor = [aColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
[rgbColor getRed: &r green: &g blue: &b alpha: &a];
diff --git a/NSAttributedString+Moxie.m b/NSAttributedString+Moxie.m
index 4837c0b..f39a4a0 100644
--- a/NSAttributedString+Moxie.m
+++ b/NSAttributedString+Moxie.m
@@ -145,7 +145,7 @@
tmpForm = [attrDict objectForKey: @":BOLD"];
if (tmpForm) {
NSColor *preColor;
- float r, g, b, a;
+ CGFloat r, g, b, a;
preColor = [myAttributes objectForKey: NSForegroundColorAttributeName];
if (preColor == nil)