Changeset 851


Ignore:
Timestamp:
Aug 22, 2011, 11:03:31 PM (8 years ago)
Author:
sam
Message:

android: fix Android NDK compilation.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/deushax/Makefile.am

    r840 r851  
    1111deushax_DEPENDENCIES = $(top_builddir)/src/liblol.a
    1212
    13 if USE_MAKE_FSELF
    1413all-local: deushax$(EXEEXT)
    15         make_fself deushax$(EXEEXT) deushax.self
     14        test x$(MAKE_FSELF) = xno || make_fself deushax$(EXEEXT) deushax.self
    1615clean-local:
    17         rm -f deushax.self
    18 endif
     16        test x$(MAKE_FSELF) = xno || rm -f deushax.self
    1917
    2018if USE_GTKGL
  • trunk/monsterz/Makefile.am

    r840 r851  
    1111monsterz_DEPENDENCIES = $(top_builddir)/src/liblol.a
    1212
    13 if USE_MAKE_FSELF
    1413all-local: monsterz$(EXEEXT)
    15         make_fself monsterz$(EXEEXT) monsterz.self
     14        test $(MAKE_FSELF) = no || make_fself monsterz$(EXEEXT) monsterz.self
    1615clean-local:
    17         rm -f monsterz.self
    18 endif
     16        test $(MAKE_FSELF) = no || rm -f monsterz.self
    1917
    2018EXTRA_DIST = $(PNG) $(WAV)
  • trunk/src/debug/quad.cpp

    r832 r851  
    946946#endif
    947947
     948#if !defined ANDROID_NDK
    948949    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     950#endif
    949951
    950952    glEnable(GL_TEXTURE_2D);
Note: See TracChangeset for help on using the changeset viewer.