diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2014-10-30 15:46:43 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2014-10-30 15:46:43 -0400 |
| commit | cebd88697dc68ef260185ca1906a84cc55e627d7 (patch) | |
| tree | 23f6ed550d268f632b60251546ff72e257b4ae9b /src | |
| parent | 12370fa4e7816a2065f475c3a2dd1912f91d0144 (diff) | |
| download | textadept-cebd88697dc68ef260185ca1906a84cc55e627d7.tar.gz textadept-cebd88697dc68ef260185ca1906a84cc55e627d7.zip | |
Added `LINUX` and `BSD` platform flags for the sake of completeness.
Previously, Linux was inferred from the expression `not WIN32 and not OSX`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/textadept.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/textadept.c b/src/textadept.c index 06c9969c..341a5719 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -99,7 +99,7 @@ typedef GtkWidget Scintilla; #define lL_openlib(l, n, f) (luaL_requiref(l, n, f, 1), lua_pop(l, 1)) #endif -static char *textadept_home; +static char *textadept_home, *platform; // User interface objects and related macros. static Scintilla *focused_view, *dummy_view, *command_entry; @@ -1567,11 +1567,7 @@ static int lL_init(lua_State *L, int argc, char **argv, int reinit) { lua_setglobal(L, "_BUFFERS"); lua_getfield(L, LUA_REGISTRYINDEX, "ta_views"), lua_setglobal(L, "_VIEWS"); lua_pushstring(L, textadept_home), lua_setglobal(L, "_HOME"); -#if _WIN32 - lua_pushboolean(L, 1), lua_setglobal(L, "WIN32"); -#elif (__APPLE__ && !CURSES) - lua_pushboolean(L, 1), lua_setglobal(L, "OSX"); -#endif + if (platform) lua_pushboolean(L, 1), lua_setglobal(L, platform); #if CURSES lua_pushboolean(L, 1), lua_setglobal(L, "CURSES"); show_tabs = 0; // TODO: tabs @@ -2294,10 +2290,12 @@ int main(int argc, char **argv) { int len = readlink("/proc/self/exe", textadept_home, FILENAME_MAX); textadept_home[len] = '\0'; if ((last_slash = strrchr(textadept_home, '/'))) *last_slash = '\0'; + platform = "LINUX"; #elif _WIN32 textadept_home = malloc(FILENAME_MAX); GetModuleFileName(0, textadept_home, FILENAME_MAX); if ((last_slash = strrchr(textadept_home, '\\'))) *last_slash = '\0'; + platform = "WIN32"; #elif __APPLE__ char *path = malloc(FILENAME_MAX), *p = NULL; uint32_t size = FILENAME_MAX; @@ -2307,6 +2305,7 @@ int main(int argc, char **argv) { free(path); #if !CURSES osxapp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); + platform = "OSX"; // OSX is only set for GUI version #endif #elif (__FreeBSD__ || __NetBSD__ || __OpenBSD__) textadept_home = malloc(FILENAME_MAX); @@ -2314,6 +2313,7 @@ int main(int argc, char **argv) { size_t cb = FILENAME_MAX; sysctl(mib, 4, textadept_home, &cb, NULL, 0); if ((last_slash = strrchr(textadept_home, '/'))) *last_slash = '\0'; + platform = "BSD"; #endif #if GTK |