Changeset 856


Ignore:
Timestamp:
Aug 24, 2011, 12:29:41 AM (8 years ago)
Author:
sam
Message:

debug: fix iOS compilation of the debug quad code.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/monsterz/ios/classes/MonsterzViewController.mm

    r855 r856  
    3636    Video::Setup(vec2i(320, 480));
    3737
    38     //new Interface();
    39     //new DebugFps(20, 20);
    40     new DebugQuad();
     38    new Interface();
     39    new DebugFps(20, 20);
     40    //new DebugQuad();
    4141
    4242    EAGLContext *aContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
  • trunk/src/debug/quad.cpp

    r855 r856  
    498498     * Renders an orange square.
    499499     */
    500 #if !defined ANDROID_NDK
     500#if !defined ANDROID_NDK && !defined __APPLE__
    501501    if (!shader[0])
    502502#if !defined __CELLOS_LV2__
     
    650650     * Renders a multicoloured square with varying colors.
    651651     */
    652 #if !defined ANDROID_NDK
     652#if !defined ANDROID_NDK && !defined __APPLE__
    653653    if (!shader[0])
    654654    {
     
    715715     * animated distorted checkerboard.
    716716     */
    717 #if !defined ANDROID_NDK
     717#if !defined ANDROID_NDK && !defined __APPLE__
    718718    if (!shader[0])
    719719#if !defined __CELLOS_LV2__
     
    946946#endif
    947947
    948 #if !defined ANDROID_NDK
     948#if !defined ANDROID_NDK && !defined __APPLE__
    949949    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
    950950#endif
Note: See TracChangeset for help on using the changeset viewer.