diff options
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/condsyms.nim | 5 | ||||
-rw-r--r-- | compiler/installer.ini | 1 | ||||
-rw-r--r-- | compiler/platform.nim | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/compiler/condsyms.nim b/compiler/condsyms.nim index a4f47ac72..dc97e3648 100644 --- a/compiler/condsyms.nim +++ b/compiler/condsyms.nim @@ -41,7 +41,10 @@ proc isDefined*(symbol: string): bool = result = targetOS in {osLinux, osMorphos, osSkyos, osIrix, osPalmos, osQnx, osAtari, osAix, osHaiku, osVxWorks, osSolaris, osNetbsd, - osFreebsd, osOpenbsd, osDragonfly, osMacosx} + osFreebsd, osOpenbsd, osDragonfly, osMacosx, + osAndroid} + of "linux": + result = targetOS in {osLinux, osAndroid} of "bsd": result = targetOS in {osNetbsd, osFreebsd, osOpenbsd, osDragonfly} of "emulatedthreadvars": diff --git a/compiler/installer.ini b/compiler/installer.ini index 680a5f9d5..979cfa3a1 100644 --- a/compiler/installer.ini +++ b/compiler/installer.ini @@ -14,6 +14,7 @@ Platforms: """ openbsd: i386;amd64 dragonfly: i386;amd64 haiku: i386;amd64 + android: i386;arm;arm64 """ Authors: "Andreas Rumpf" diff --git a/compiler/platform.nim b/compiler/platform.nim index e8b80ab9c..01ddba23e 100644 --- a/compiler/platform.nim +++ b/compiler/platform.nim @@ -21,8 +21,8 @@ type # conditionals to condsyms (end of module). osNone, osDos, osWindows, osOs2, osLinux, osMorphos, osSkyos, osSolaris, osIrix, osNetbsd, osFreebsd, osOpenbsd, osDragonfly, osAix, osPalmos, osQnx, - osAmiga, osAtari, osNetware, osMacos, osMacosx, osHaiku, osVxworks, osGenode - osJS, osNimrodVM, osStandalone + osAmiga, osAtari, osNetware, osMacos, osMacosx, osHaiku, osAndroid, osVxworks + osGenode, osJS, osNimrodVM, osStandalone type TInfoOSProp* = enum @@ -143,6 +143,10 @@ const objExt: ".o", newLine: "\x0A", pathSep: ":", dirSep: "/", scriptExt: ".sh", curDir: ".", exeExt: "", extSep: ".", props: {ospNeedsPIC, ospPosix, ospLacksThreadVars}), + (name: "Android", parDir: "..", dllFrmt: "lib$1.so", altDirSep: "/", + objExt: ".o", newLine: "\x0A", pathSep: ":", dirSep: "/", + scriptExt: ".sh", curDir: ".", exeExt: "", extSep: ".", + props: {ospNeedsPIC, ospPosix}), (name: "VxWorks", parDir: "..", dllFrmt: "lib$1.so", altDirSep: "/", objExt: ".o", newLine: "\x0A", pathSep: ";", dirSep: "\\", scriptExt: ".sh", curDir: ".", exeExt: ".vxe", extSep: ".", |