Changeset 943 for trunk


Ignore:
Timestamp:
Sep 10, 2011, 5:49:11 PM (12 years ago)
Author:
sam
Message:

ios: fix iOS build by adding missing files to XCode project.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r938 r943  
    113113  GL_LIBS="${GL_LIBS} ${GLES2_LIBS}"],
    114114 [:])
     115
     116PKG_CHECK_MODULES(GL, gl,
     117 [ac_cv_my_have_gl="yes"
     118  AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available)],
     119 [:])
     120
    115121AC_CHECK_LIB(GL, glLoadIdentity,
    116122 [ac_cv_my_have_gl="yes"

  • trunk/monsterz/ios/monsterz.xcodeproj/project.pbxproj

    r855 r943  
    1212                1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
    1313                1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
     14                227C9D22141BB7560029A3F0 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 227C9D20141BB7560029A3F0 /* image.cpp */; };
     15                227C9D25141BBA200029A3F0 /* gradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 227C9D23141BBA200029A3F0 /* gradient.cpp */; };
     16                227C9D28141BBA2D0029A3F0 /* half.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 227C9D26141BBA2D0029A3F0 /* half.cpp */; };
     17                227C9D2B141BBA3C0029A3F0 /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 227C9D29141BBA3C0029A3F0 /* sprite.cpp */; };
     18                227C9D2E141BBA4A0029A3F0 /* trig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 227C9D2C141BBA4A0029A3F0 /* trig.cpp */; };
    1419                22C714C713FB155B0023929C /* ground.png in Resources */ = {isa = PBXBuildFile; fileRef = 22C714C513FB155B0023929C /* ground.png */; };
    1520                22C714C813FB155B0023929C /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 22C714C613FB155B0023929C /* logo.png */; };
    … …  
    6267                CEA12E671326F0BE001D45B5 /* forge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E271326F0BE001D45B5 /* forge.cpp */; };
    6368                CEA12E681326F0BE001D45B5 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E291326F0BE001D45B5 /* hash.cpp */; };
    64                 CEA12E691326F0BE001D45B5 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E2B1326F0BE001D45B5 /* image.cpp */; };
    6569                CEA12E6A1326F0BE001D45B5 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E2D1326F0BE001D45B5 /* input.cpp */; };
    6670                CEA12E6B1326F0BE001D45B5 /* layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E2F1326F0BE001D45B5 /* layer.cpp */; };
    … …  
    9397                1D6058910D05DD3D006BFB54 /* Monsterz.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Monsterz.app; sourceTree = BUILT_PRODUCTS_DIR; };
    9498                1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
     99                227C9D20141BB7560029A3F0 /* image.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = image.cpp; path = ../../src/image/image.cpp; sourceTree = "<group>"; };
     100                227C9D21141BB7560029A3F0 /* image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = image.h; path = ../../src/image/image.h; sourceTree = "<group>"; };
     101                227C9D23141BBA200029A3F0 /* gradient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gradient.cpp; path = ../../src/gradient.cpp; sourceTree = "<group>"; };
     102                227C9D24141BBA200029A3F0 /* gradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gradient.h; path = ../../src/gradient.h; sourceTree = "<group>"; };
     103                227C9D26141BBA2D0029A3F0 /* half.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = half.cpp; path = ../../src/half.cpp; sourceTree = "<group>"; };
     104                227C9D27141BBA2D0029A3F0 /* half.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = half.h; path = ../../src/half.h; sourceTree = "<group>"; };
     105                227C9D29141BBA3C0029A3F0 /* sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sprite.cpp; path = ../../src/sprite.cpp; sourceTree = "<group>"; };
     106                227C9D2A141BBA3C0029A3F0 /* sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sprite.h; path = ../../src/sprite.h; sourceTree = "<group>"; };
     107                227C9D2C141BBA4A0029A3F0 /* trig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = trig.cpp; path = ../../src/trig.cpp; sourceTree = "<group>"; };
     108                227C9D2D141BBA4A0029A3F0 /* trig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = trig.h; path = ../../src/trig.h; sourceTree = "<group>"; };
    95109                22C714C513FB155B0023929C /* ground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ground.png; sourceTree = "<group>"; };
    96110                22C714C613FB155B0023929C /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
    … …  
    166180                CEA12E291326F0BE001D45B5 /* hash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hash.cpp; path = ../../src/hash.cpp; sourceTree = SOURCE_ROOT; };
    167181                CEA12E2A1326F0BE001D45B5 /* hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hash.h; path = ../../src/hash.h; sourceTree = SOURCE_ROOT; };
    168                 CEA12E2B1326F0BE001D45B5 /* image.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = image.cpp; path = ../../src/image.cpp; sourceTree = SOURCE_ROOT; };
    169                 CEA12E2C1326F0BE001D45B5 /* image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = image.h; path = ../../src/image.h; sourceTree = SOURCE_ROOT; };
    170182                CEA12E2D1326F0BE001D45B5 /* input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = input.cpp; path = ../../src/input.cpp; sourceTree = SOURCE_ROOT; };
    171183                CEA12E2E1326F0BE001D45B5 /* input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = input.h; path = ../../src/input.h; sourceTree = SOURCE_ROOT; };
    … …  
    255267                        sourceTree = "<group>";
    256268                };
     269                227C9D1F141BB72B0029A3F0 /* image */ = {
     270                        isa = PBXGroup;
     271                        children = (
     272                                227C9D20141BB7560029A3F0 /* image.cpp */,
     273                                227C9D21141BB7560029A3F0 /* image.h */,
     274                        );
     275                        name = image;
     276                        sourceTree = "<group>";
     277                };
    257278                22C714C413FB155B0023929C /* title */ = {
    258279                        isa = PBXGroup;
    … …  
    342363                        isa = PBXGroup;
    343364                        children = (
     365                                227C9D2C141BBA4A0029A3F0 /* trig.cpp */,
     366                                227C9D2D141BBA4A0029A3F0 /* trig.h */,
     367                                227C9D29141BBA3C0029A3F0 /* sprite.cpp */,
     368                                227C9D2A141BBA3C0029A3F0 /* sprite.h */,
     369                                227C9D26141BBA2D0029A3F0 /* half.cpp */,
     370                                227C9D27141BBA2D0029A3F0 /* half.h */,
     371                                227C9D23141BBA200029A3F0 /* gradient.cpp */,
     372                                227C9D24141BBA200029A3F0 /* gradient.h */,
     373                                227C9D1F141BB72B0029A3F0 /* image */,
    344374                                22F664A713FB15CB005F963B /* debug */,
    345375                                22F664A313FB15CB005F963B /* shader */,
    … …  
    364394                                CEA12E291326F0BE001D45B5 /* hash.cpp */,
    365395                                CEA12E2A1326F0BE001D45B5 /* hash.h */,
    366                                 CEA12E2B1326F0BE001D45B5 /* image.cpp */,
    367                                 CEA12E2C1326F0BE001D45B5 /* image.h */,
    368396                                CEA12E2D1326F0BE001D45B5 /* input.cpp */,
    369397                                CEA12E2E1326F0BE001D45B5 /* input.h */,
    … …  
    562590                                CEA12E671326F0BE001D45B5 /* forge.cpp in Sources */,
    563591                                CEA12E681326F0BE001D45B5 /* hash.cpp in Sources */,
    564                                 CEA12E691326F0BE001D45B5 /* image.cpp in Sources */,
    565592                                CEA12E6A1326F0BE001D45B5 /* input.cpp in Sources */,
    566593                                CEA12E6B1326F0BE001D45B5 /* layer.cpp in Sources */,
    … …  
    594621                                22F664B613FB15CB005F963B /* stats.cpp in Sources */,
    595622                                22F664B913FB15CB005F963B /* score.cpp in Sources */,
     623                                227C9D22141BB7560029A3F0 /* image.cpp in Sources */,
     624                                227C9D25141BBA200029A3F0 /* gradient.cpp in Sources */,
     625                                227C9D28141BBA2D0029A3F0 /* half.cpp in Sources */,
     626                                227C9D2B141BBA3C0029A3F0 /* sprite.cpp in Sources */,
     627                                227C9D2E141BBA4A0029A3F0 /* trig.cpp in Sources */,
    596628                        );
    597629                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/src/debug/quad.cpp

    r939 r943  
    10831083    glClientActiveTexture(GL_TEXTURE0);
    10841084#endif
    1085 #if !defined __CELLOS_LV2__ && !defined __ANDROID__
     1085#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
    10861086    glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE);
    10871087#endif
    … …  
    10891089
    10901090    glDisable(GL_BLEND);
    1091 #if !defined __CELLOS_LV2__ && !defined __ANDROID__
     1091#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
    10921092    glDisable(GL_POINT_SPRITE);
    10931093#endif
    … …  
    11011101#endif
    11021102
    1103 #if !defined __CELLOS_LV2__ && !defined __ANDROID__
     1103#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
    11041104    glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
    11051105#endif
Note: See TracChangeset for help on using the changeset viewer.