Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some Mac build breakage, removed some debug code.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3171 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2010-04-16 08:46:54 +00:00
parent 22387e560c
commit 731fae187f
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Oolite.xcodeproj/project.pbxproj
View File

@ -52,6 +52,7 @@
1A0729DA0EF56D1200B0F925 /* OOConvertSystemDescriptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A0729D80EF56D1200B0F925 /* OOConvertSystemDescriptions.m */; };
1A0729FE0EF5796500B0F925 /* OldSchoolPropertyListWriting.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0729FC0EF5796500B0F925 /* OldSchoolPropertyListWriting.h */; };
1A0729FF0EF5796500B0F925 /* OldSchoolPropertyListWriting.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A0729FD0EF5796500B0F925 /* OldSchoolPropertyListWriting.m */; };
1A0B00471178559A0095EF13 /* libpng_for_oolite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A71E6F30BCE340C00CD5C13 /* libpng_for_oolite.a */; };
1A0BF3D510DAE2B30099984D /* cobra1_redux1.dat in Copy Models */ = {isa = PBXBuildFile; fileRef = 1A0BF3D310DAE2B30099984D /* cobra1_redux1.dat */; };
1A0BF3D610DAE2B30099984D /* cobra1_redux2.dat in Copy Models */ = {isa = PBXBuildFile; fileRef = 1A0BF3D410DAE2B30099984D /* cobra1_redux2.dat */; };
1A0BF3D810DAE2EC0099984D /* mamba_redux1.dat in Copy Models */ = {isa = PBXBuildFile; fileRef = 1A0BF3D710DAE2EC0099984D /* mamba_redux1.dat */; };
@ -393,7 +394,6 @@
1A43F28B105170A8003FDE8B /* OONSOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43F28A105170A8003FDE8B /* OONSOperation.h */; };
1A4501E20DBF699A00815C04 /* descriptions.plist in Copy Config */ = {isa = PBXBuildFile; fileRef = 1A4501E10DBF699A00815C04 /* descriptions.plist */; };
1A451D8D0BB1BD2A004CD72F /* OOMaths.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9404920BAF4582005F6CF3 /* OOMaths.h */; };
1A45BCE4104ABB2100A89324 /* libpng_for_oolite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A71E6F30BCE340C00CD5C13 /* libpng_for_oolite.a */; };
1A472917096B5454000E78D8 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A472916096B5454000E78D8 /* CoreAudio.framework */; };
1A472921096B5468000E78D8 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A47291F096B5468000E78D8 /* AudioToolbox.framework */; };
1A472922096B5468000E78D8 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A472920096B5468000E78D8 /* AudioUnit.framework */; };
@ -1864,7 +1864,7 @@
1A472922096B5468000E78D8 /* AudioUnit.framework in Frameworks */,
1A71E8790BCE8EB100CD5C13 /* libz.dylib in Frameworks */,
1A4FB4BA0C8E11D800DC8E1F /* libjs.a in Frameworks */,
1A45BCE4104ABB2100A89324 /* libpng_for_oolite.a in Frameworks */,
1A0B00471178559A0095EF13 /* libpng_for_oolite.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -3826,7 +3826,7 @@
INSTALL_PATH = /usr/local/lib;
LLVM_LTO = YES;
PREBINDING = NO;
PRODUCT_NAME = png;
PRODUCT_NAME = png_for_oolite;
RUN_CLANG_STATIC_ANALYZER = YES;
ZERO_LINK = NO;
};
@ -3937,7 +3937,7 @@
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/src/Core/Materials/\"";
INSTALL_PATH = /usr/local/lib;
PREBINDING = NO;
PRODUCT_NAME = png;
PRODUCT_NAME = png_for_oolite;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT_i386 = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
ZERO_LINK = NO;

4
src/Core/Materials/OOTextureChannelExtractor.m
View File

@ -60,8 +60,6 @@ BOOL OOExtractPixMapChannel(OOPixMap *ioPixMap, OOPixMapComponentCount channelIn
return NO;
}
OODumpPixMap(*ioPixMap, @"pre-extraction");
ExtractChannel_4(ioPixMap, channelIndex);
ioPixMap->components = 1;
@ -72,8 +70,6 @@ BOOL OOExtractPixMapChannel(OOPixMap *ioPixMap, OOPixMapComponentCount channelIn
OOCompactPixMap(ioPixMap);
}
OODumpPixMap(*ioPixMap, @"extracted");
return YES;
}

5
src/Core/OOEquipmentType.m
View File

@ -81,8 +81,7 @@ static NSDictionary *sEquipmentTypesByIdentifier = nil;
[sEquipmentTypes release];
sEquipmentTypes = nil;
equipmentTypes = [NSMutableArray arrayWithCapacity:[equipmentData count]];
[sEquipmentTypesByIdentifier release];
sEquipmentTypesByIdentifier = nil;
DESTROY(sEquipmentTypesByIdentifier);
equipmentTypesByIdentifier = [NSMutableDictionary dictionaryWithCapacity:[equipmentData count]];
for (itemEnum = [equipmentData objectEnumerator]; (itemInfo = [itemEnum nextObject]); )
@ -96,7 +95,7 @@ static NSDictionary *sEquipmentTypesByIdentifier = nil;
}
sEquipmentTypes = [equipmentTypes copy];
sEquipmentTypesByIdentifier = [equipmentTypesByIdentifier copy];
sEquipmentTypesByIdentifier = [[NSDictionary alloc] initWithDictionary:equipmentTypesByIdentifier];
}