Changeset 225 for cpp


Ignore:
Timestamp:
04/16/14 19:29:13 (11 years ago)
Author:
Maciej Komosinski
Message:

Compilation for Android

Location:
cpp/frams
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • cpp/frams/config/version.h

    r197 r225  
    33// Refer to http://www.framsticks.com/ for further information.
    44
    5 #define MAIN_REL_ID "4.0rc8"
     5#define MAIN_REL_ID "4.0rc9"

  • cpp/frams/util/3d.h

    r197 r225  
    66#define _3D_H_
    77
    8 #ifdef SHP
     8#if defined SHP || defined __ANDROID__
    99#include <string.h> //memcpy
    1010#else

  • cpp/frams/virtfile/virtfile.cpp

    r206 r225  
    6868
    6969//since we want our own feof(VirtFILE*) function and some systems unfortunately define feof as a macro, we need to #undef it. Same as in virtfile.h
    70 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP
     70#if defined _MSC_VER || defined __CYGWIN__ || defined SHP || defined __ANDROID__
    7171 #pragma push_macro("feof")
    7272 #undef feof
    … …  
    7979
    8080//...and then restore the original macro:
    81 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP
     81#if defined _MSC_VER || defined __CYGWIN__ || defined SHP || defined __ANDROID__
    8282 #pragma pop_macro("feof")
    8383#endif
    84 #ifdef __BORLANDC__
     84#if defined __BORLANDC__
    8585 #define feof(__f)     ((__f)->flags & _F_EOF)
    8686#endif

  • cpp/frams/virtfile/virtfile.h

    r211 r225  
    7373
    7474//since we want our own feof(VirtFILE*) function and some systems unfortunately define feof as a macro, we need to #undef it. Same as in virtfile.cpp
    75 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP
     75#if defined _MSC_VER || defined __CYGWIN__ || defined SHP || defined __ANDROID__
    7676 #pragma push_macro("feof")
    7777 #undef feof
    … …  
    8484
    8585//...and then restore the original macro:
    86 #if defined _MSC_VER || defined __CYGWIN__ || defined SHP
     86#if defined _MSC_VER || defined __CYGWIN__ || defined SHP || defined __ANDROID__
    8787 #pragma pop_macro("feof")
    8888#endif
    89 #ifdef __BORLANDC__
     89#if defined __BORLANDC__
    9090 #define feof(__f)     ((__f)->flags & _F_EOF)
    9191#endif
Note: See TracChangeset for help on using the changeset viewer.