Skip to content

Commit 0f9bbcc

Browse files
yvtyvt
committed
Xcode project is now up-to-date
1 parent 2b5c49d commit 0f9bbcc

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

‎OpenSpades.h

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// This header file is provided for the Xcode project.
2+
// In other platforms, please use OpenSpades.h generated by CMake.
3+
4+
#define OpenSpades_VERSION_MAJOR 0
5+
#define OpenSpades_VERSION_MINOR 0
6+
#define OpenSpades_VERSION_REVISION 12
7+
8+
#define OS_STRINGIFY2(x) #x
9+
#define OS_STRINGIFY(x) OS_STRINGIFY2(x)
10+
11+
#define OpenSpades_VER_STR "OpenSpades 0.0.12 for OS X"
12+
#define PACKAGE_STRING OpenSpades_VER_STR
13+
14+
/* #undef HAS_OPENAL */
15+
16+
/* #undef RESDIR_DEFINED */
17+
//#define RESDIR ""

‎OpenSpades.xcodeproj/project.pbxproj

+2-14
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,6 @@
465465
E8B6B74617EA0F2600E35523 /* IGrenadeSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8B6B74417EA0F1B00E35523 /* IGrenadeSkin.cpp */; };
466466
E8B6B74917EA12EC00E35523 /* IWeaponSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8B6B74717EA12E100E35523 /* IWeaponSkin.cpp */; };
467467
E8B93AD518559EC700BD01E1 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8B93AD418559EC600BD01E1 /* SDL2.framework */; };
468-
E8C68A511C5BD8E200C52C3F /* Palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8C68A501C5BD8E200C52C3F /* Palette.cpp */; };
469-
E8C68A521C5BD8F200C52C3F /* Palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8C68A501C5BD8E200C52C3F /* Palette.cpp */; };
470468
E8C92A0C18695EA500740C9F /* SWModelRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8C92A0A18695EA500740C9F /* SWModelRenderer.cpp */; };
471469
E8C92A0F186A902500740C9F /* CpuID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8C92A0E186A902500740C9F /* CpuID.cpp */; };
472470
E8CF039A178EDABD000683D4 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8CF0399178EDABD000683D4 /* OpenAL.framework */; };
@@ -997,7 +995,6 @@
997995
E8B6B74817EA12E500E35523 /* IWeaponSkin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IWeaponSkin.h; sourceTree = "<group>"; };
998996
E8B8082718E05B920001013E /* CellToTriangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CellToTriangle.h; sourceTree = "<group>"; };
999997
E8B93AD418559EC600BD01E1 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../../Library/Frameworks/SDL2.framework; sourceTree = "<group>"; };
1000-
E8C68A501C5BD8E200C52C3F /* Palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Palette.cpp; sourceTree = "<group>"; };
1001998
E8C92A0A18695EA500740C9F /* SWModelRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SWModelRenderer.cpp; sourceTree = "<group>"; };
1002999
E8C92A0B18695EA500740C9F /* SWModelRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWModelRenderer.h; sourceTree = "<group>"; };
10031000
E8C92A0D186A8D3600740C9F /* CpuID.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CpuID.h; sourceTree = "<group>"; };
@@ -1039,7 +1036,6 @@
10391036
E8CF03DF178EF4E9000683D4 /* IRunnable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRunnable.h; sourceTree = "<group>"; };
10401037
E8CF03E1178EF57E000683D4 /* SDLRunner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SDLRunner.cpp; sourceTree = "<group>"; };
10411038
E8CF03E2178EF57E000683D4 /* SDLRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRunner.h; sourceTree = "<group>"; };
1042-
E8CF03E4178EF5FF000683D4 /* libfltk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfltk.a; path = ../../../../../usr/local/lib/libfltk.a; sourceTree = "<group>"; };
10431039
E8CF03EA178EF8FE000683D4 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
10441040
E8CF03EC178EF904000683D4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
10451041
E8CF03EE178EF909000683D4 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
@@ -1113,8 +1109,6 @@
11131109
E8E44684179CC4FF00BE8855 /* IBitmapCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IBitmapCodec.cpp; sourceTree = "<group>"; };
11141110
E8E44685179CC4FF00BE8855 /* IBitmapCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IBitmapCodec.h; sourceTree = "<group>"; };
11151111
E8E44687179CC65900BE8855 /* TargaReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TargaReader.cpp; sourceTree = "<group>"; };
1116-
E8E4468D179CE7A200BE8855 /* libfltk_images.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfltk_images.a; path = ../../../../../usr/local/lib/libfltk_images.a; sourceTree = "<group>"; };
1117-
E8E4468E179CE7A200BE8855 /* libfltk_jpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfltk_jpeg.a; path = ../../../../../usr/local/lib/libfltk_jpeg.a; sourceTree = "<group>"; };
11181112
E8E44691179CE7B800BE8855 /* libpng15.15.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng15.15.dylib; path = ../../../../../opt/X11/lib/libpng15.15.dylib; sourceTree = "<group>"; };
11191113
E8E44696179D2CA100BE8855 /* IGLSpriteRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IGLSpriteRenderer.cpp; sourceTree = "<group>"; };
11201114
E8E44697179D2CA100BE8855 /* IGLSpriteRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IGLSpriteRenderer.h; sourceTree = "<group>"; };
@@ -1716,14 +1710,11 @@
17161710
E844888617D26699005105D0 /* libcurl.dylib */,
17171711
E8E446AB17A02EC700BE8855 /* Supporting Files */,
17181712
E8E44691179CE7B800BE8855 /* libpng15.15.dylib */,
1719-
E8E4468D179CE7A200BE8855 /* libfltk_images.a */,
1720-
E8E4468E179CE7A200BE8855 /* libfltk_jpeg.a */,
17211713
E8CF03F2178EF916000683D4 /* Cocoa.framework */,
17221714
E8CF03F0178EF910000683D4 /* Foundation.framework */,
17231715
E8CF03EE178EF909000683D4 /* CoreText.framework */,
17241716
E8CF03EC178EF904000683D4 /* CoreGraphics.framework */,
17251717
E8CF03EA178EF8FE000683D4 /* CoreFoundation.framework */,
1726-
E8CF03E4178EF5FF000683D4 /* libfltk.a */,
17271718
E8CF03C4178EE78C000683D4 /* OpenGL.framework */,
17281719
E8CF039B178EDAC9000683D4 /* libz.dylib */,
17291720
E8CF0399178EDABD000683D4 /* OpenAL.framework */,
@@ -1872,7 +1863,6 @@
18721863
E8E0AF8B17993C2300C6B5A9 /* Client Main */ = {
18731864
isa = PBXGroup;
18741865
children = (
1875-
E8C68A501C5BD8E200C52C3F /* Palette.cpp */,
18761866
E844886317D0C404005105D0 /* Local Entities */,
18771867
E8CF03C1178EE6D8000683D4 /* Client.cpp */,
18781868
E8FE748B18CC6AA100291338 /* Client_Input.cpp */,
@@ -2306,7 +2296,6 @@
23062296
E82E673618EA7972004DBA18 /* as_callfunc.cpp in Sources */,
23072297
E82E673718EA7972004DBA18 /* as_callfunc_arm.cpp in Sources */,
23082298
E82E673818EA7972004DBA18 /* as_callfunc_mips.cpp in Sources */,
2309-
E8C68A521C5BD8F200C52C3F /* Palette.cpp in Sources */,
23102299
E82E673918EA7972004DBA18 /* as_callfunc_ppc.cpp in Sources */,
23112300
E82E673A18EA7972004DBA18 /* as_callfunc_ppc_64.cpp in Sources */,
23122301
E82E673B18EA7972004DBA18 /* as_callfunc_sh4.cpp in Sources */,
@@ -2627,7 +2616,6 @@
26272616
E8567E761793D60E009D83E0 /* GLModelManager.cpp in Sources */,
26282617
E8567E791793DC37009D83E0 /* VoxelModel.cpp in Sources */,
26292618
E8567E7C1793E105009D83E0 /* GLModel.cpp in Sources */,
2630-
E8C68A511C5BD8E200C52C3F /* Palette.cpp in Sources */,
26312619
E8567E7F1793E1B3009D83E0 /* GLVoxelModel.cpp in Sources */,
26322620
E834F55017942C43004EBE88 /* Grenade.cpp in Sources */,
26332621
E88EB02F185D9DC500565D07 /* YsrDevice.cpp in Sources */,
@@ -2889,7 +2877,7 @@
28892877
isa = XCBuildConfiguration;
28902878
buildSettings = {
28912879
ALWAYS_SEARCH_USER_PATHS = NO;
2892-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
2880+
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
28932881
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
28942882
CLANG_CXX_LIBRARY = "libc++";
28952883
CLANG_ENABLE_OBJC_ARC = NO;
@@ -2936,7 +2924,7 @@
29362924
isa = XCBuildConfiguration;
29372925
buildSettings = {
29382926
ALWAYS_SEARCH_USER_PATHS = NO;
2939-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
2927+
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
29402928
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
29412929
CLANG_CXX_LIBRARY = "libc++";
29422930
CLANG_ENABLE_OBJC_ARC = NO;

0 commit comments

Comments
 (0)