Fix for Android build.

freejoy.mod/freejoy.bmx

@@ -33,10 +33,15 @@ Import "freejoy.macosx.c"
 Import "-framework IOKit"
 ?Win32
 Import "freejoy.win32.c"
-?Linux
+?Linuxx86
+Import "freejoy.linux.c"
+?Linuxx64
+Import "freejoy.linux.c"
+?raspberrypi
 Import "freejoy.linux.c"
 ?
 
+?Not android
 Extern
 
 	Function freejoy_JoyCount:Int() = "JoyCount"
@@ -222,3 +227,5 @@ New TFreeJoyDriver
 
 ' make ourself the default
 GetJoystickDriver("FreeJoy")
+
+?

freetype.mod/freetype.bmx

@@ -30,71 +30,36 @@ ftoption.h : FT_RENDER_POOL_SIZE changed to 65536L, was 16384. This appears to b
 
 End Rem
 
-?Linux
+?Linuxx86
 
 ModuleInfo "CC_OPTS: `freetype-config --cflags`"
 
 Import "-lfreetype"
 
-?Not Linux
+?Linuxx64
 
-Import Pub.ZLib
+ModuleInfo "CC_OPTS: `freetype-config --cflags`"
 
-Rem
-bbox   bdf    bitmap debug  gasp
-glyph  gxval  init   lcdfil mm
-otval  pfr    stroke synth  system
-type1  winfnt xf86   patent
-End Rem
+Import "-lfreetype"
 
-ModuleInfo "CC_OPTS: -DFT2_BUILD_LIBRARY"
+?raspberrypi
 
-Import "include/*.h"
+ModuleInfo "CC_OPTS: `freetype-config --cflags`"
 
-Import "src/base/ftbase.c"
-
-Import "src/base/ftapi.c"
-Import "src/base/ftbbox.c"
-Import "src/base/ftbdf.c"
-Import "src/base/ftbitmap.c"
-Import "src/base/ftdebug.c"
-Import "src/base/ftgasp.c"
-Import "src/base/ftglyph.c"
-Import "src/base/ftgxval.c"
-Import "src/base/ftinit.c"
-Import "src/base/ftlcdfil.c"
-Import "src/base/ftmm.c"
-Import "src/base/ftotval.c"
-Import "src/base/ftpfr.c"
-Import "src/base/ftstroke.c"
-Import "src/base/ftsynth.c"
-Import "src/base/ftsystem.c"
-Import "src/base/fttype1.c"
-Import "src/base/ftwinfnt.c"
-Import "src/base/ftxf86.c"
-Import "src/base/ftpatent.c"
-
-Import "src/autofit/autofit.c"
-Import "src/bdf/bdf.c"
-Import "src/cache/ftcache.c"
-Import "src/cff/cff.c"
-Import "src/cid/type1cid.c"
-Import "src/gzip/ftgzip.c"
-Import "src/lzw/ftlzw.c"
-Import "src/otvalid/otvalid.c"
-Import "src/pcf/pcf.c"
-Import "src/pfr/pfr.c"
-Import "src/psaux/psaux.c"
-Import "src/pshinter/pshinter.c"
-Import "src/psnames/psnames.c"
-Import "src/raster/raster.c"
-Import "src/sfnt/sfnt.c"
-Import "src/smooth/smooth.c"
-Import "src/truetype/truetype.c"
-Import "src/type1/type1.c"
-Import "src/type42/type42.c"
-Import "src/winfonts/winfnt.c"
+Import "-lfreetype"
 
+?win32
+ModuleInfo "CC_OPTS: -DFT2_BUILD_LIBRARY"
+Import "source.bmx"
+Import "include/*.h"
+?macos
+ModuleInfo "CC_OPTS: -DFT2_BUILD_LIBRARY"
+Import "source.bmx"
+Import "include/*.h"
+?android
+ModuleInfo "CC_OPTS: -DFT2_BUILD_LIBRARY"
+Import "source.bmx"
+Import "include/*.h"
 ?
 
 Import "glue.c"

freetype.mod/source.bmx

@@ -0,0 +1,59 @@
+Strict
+
+
+Import Pub.ZLib
+
+Rem
+bbox   bdf    bitmap debug  gasp
+glyph  gxval  init   lcdfil mm
+otval  pfr    stroke synth  system
+type1  winfnt xf86   patent
+End Rem
+
+
+Import "include/*.h"
+
+Import "src/base/ftbase.c"
+
+Import "src/base/ftapi.c"
+Import "src/base/ftbbox.c"
+Import "src/base/ftbdf.c"
+Import "src/base/ftbitmap.c"
+Import "src/base/ftdebug.c"
+Import "src/base/ftgasp.c"
+Import "src/base/ftglyph.c"
+Import "src/base/ftgxval.c"
+Import "src/base/ftinit.c"
+Import "src/base/ftlcdfil.c"
+Import "src/base/ftmm.c"
+Import "src/base/ftotval.c"
+Import "src/base/ftpfr.c"
+Import "src/base/ftstroke.c"
+Import "src/base/ftsynth.c"
+Import "src/base/ftsystem.c"
+Import "src/base/fttype1.c"
+Import "src/base/ftwinfnt.c"
+Import "src/base/ftxf86.c"
+Import "src/base/ftpatent.c"
+
+Import "src/autofit/autofit.c"
+Import "src/bdf/bdf.c"
+Import "src/cache/ftcache.c"
+Import "src/cff/cff.c"
+Import "src/cid/type1cid.c"
+Import "src/gzip/ftgzip.c"
+Import "src/lzw/ftlzw.c"
+Import "src/otvalid/otvalid.c"
+Import "src/pcf/pcf.c"
+Import "src/pfr/pfr.c"
+Import "src/psaux/psaux.c"
+Import "src/pshinter/pshinter.c"
+Import "src/psnames/psnames.c"
+Import "src/raster/raster.c"
+Import "src/sfnt/sfnt.c"
+Import "src/smooth/smooth.c"
+Import "src/truetype/truetype.c"
+Import "src/type1/type1.c"
+Import "src/type42/type42.c"
+Import "src/winfonts/winfnt.c"
+

opengl.mod/opengl.bmx

@@ -16,16 +16,22 @@ ModuleInfo "History: Restored GLU"
 ?MacOS
 Import "-framework AGL"
 Import "-framework OpenGL"
+Import "glu.bmx"
 ?Win32
 Import "GL/gl.h"
 Import "-lglu32"
 Import "-lopengl32"
-?Linux
+Import "glu.bmx"
+?Linuxx86
 Import "-lGL"
 Import "-lGLU"
+Import "glu.bmx"
+?Linuxx64
+Import "-lGL"
+Import "-lGLU"
+Import "glu.bmx"
 ?
 
-Import "glu.bmx"
 
 Extern "Os"