Ignore:
Timestamp:
Sep 10, 2011, 2:42:13 PM (9 years ago)
Author:
sam
Message:

build: stop defining ANDROID_NDK and check for ANDROID instead.

According to David Turner, “it should be the only thing that NDK users
should be testing again.”

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/video.cpp

    r863 r939  
    3434private:
    3535    static mat4 proj_matrix, view_matrix;
    36 #if defined ANDROID_NDK || defined __CELLOS_LV2__
     36#if defined __ANDROID__ || defined __CELLOS_LV2__
    3737    static ivec2 saved_viewport;
    3838#endif
     
    4242mat4 VideoData::view_matrix;
    4343
    44 #if defined ANDROID_NDK || defined __CELLOS_LV2__
     44#if defined __ANDROID__ || defined __CELLOS_LV2__
    4545ivec2 VideoData::saved_viewport = 0;
    4646#endif
     
    6565    glViewport(0, 0, size.x, size.y);
    6666
    67 #if defined ANDROID_NDK || defined __CELLOS_LV2__
     67#if defined __ANDROID__ || defined __CELLOS_LV2__
    6868    VideoData::saved_viewport = size;
    6969#endif
     
    8686    float far = size.x + size.y;
    8787
    88 #if defined ANDROID_NDK
     88#if defined __ANDROID__
    8989    size = vec2(640.0f, 480.0f);
    9090#endif
     
    179179ivec2 Video::GetSize()
    180180{
    181 #if defined ANDROID_NDK
     181#if defined __ANDROID__
    182182    return VideoData::saved_viewport;
    183183#elif defined __CELLOS_LV2__
Note: See TracChangeset for help on using the changeset viewer.