Fix Haiku support
- contrib/curl: use linux config for Haiku Like svr4 we don't have SIOCGIFADDR. - Haiku is POSIX enough - Add libs for Haiku Not tested yet - contrib: fix Haiku bootstrap - Fix os.getversion() for Haiku - Fix bootstrap on Haiku
This commit is contained in:
parent
e5e4f382e2
commit
fd8bfef352
@ -103,6 +103,16 @@ solaris: $(SRC)
|
|||||||
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
|
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
|
||||||
$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
|
$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
|
||||||
|
|
||||||
|
haiku: $(SRC)
|
||||||
|
$(SILENT) rm -rf ./bin
|
||||||
|
$(SILENT) rm -rf ./build
|
||||||
|
$(SILENT) rm -rf ./obj
|
||||||
|
mkdir -p build/bootstrap
|
||||||
|
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_BSD_SOURCE -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lbsd
|
||||||
|
./build/bootstrap/premake_bootstrap embed
|
||||||
|
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
|
||||||
|
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
|
||||||
|
|
||||||
windows-base: $(SRC)
|
windows-base: $(SRC)
|
||||||
$(SILENT) if exist .\bin rmdir /s /q .\bin
|
$(SILENT) if exist .\bin rmdir /s /q .\bin
|
||||||
$(SILENT) if exist .\build rmdir /s /q .\build
|
$(SILENT) if exist .\build rmdir /s /q .\build
|
||||||
|
@ -86,7 +86,7 @@
|
|||||||
# include "config-linux.h"
|
# include "config-linux.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__sun__) && defined(__svr4__)
|
#if defined(__sun__) && defined(__svr4__) || defined(__HAIKU__)
|
||||||
# include "config-linux.h"
|
# include "config-linux.h"
|
||||||
# undef HAVE_IOCTL_SIOCGIFADDR
|
# undef HAVE_IOCTL_SIOCGIFADDR
|
||||||
#endif
|
#endif
|
||||||
|
@ -11,7 +11,7 @@ project "zip-lib"
|
|||||||
"**.c"
|
"**.c"
|
||||||
}
|
}
|
||||||
|
|
||||||
filter "system:linux or bsd or solaris"
|
filter "system:linux or bsd or solaris or haiku"
|
||||||
defines { "HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H" }
|
defines { "HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H" }
|
||||||
|
|
||||||
filter "system:windows"
|
filter "system:windows"
|
||||||
|
@ -21,7 +21,7 @@ project "lua-lib"
|
|||||||
"etc/*.c"
|
"etc/*.c"
|
||||||
}
|
}
|
||||||
|
|
||||||
filter "system:linux or bsd or hurd or aix or solaris"
|
filter "system:linux or bsd or hurd or aix or solaris or haiku"
|
||||||
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
||||||
|
|
||||||
filter "system:macosx"
|
filter "system:macosx"
|
||||||
|
@ -13,7 +13,7 @@ project "luashim-lib"
|
|||||||
"*.lua"
|
"*.lua"
|
||||||
}
|
}
|
||||||
|
|
||||||
filter "system:linux or bsd or hurd or aix"
|
filter "system:linux or bsd or hurd or aix or haiku"
|
||||||
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
||||||
|
|
||||||
filter "system:macosx"
|
filter "system:macosx"
|
||||||
|
@ -197,6 +197,10 @@
|
|||||||
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
||||||
links { "m" }
|
links { "m" }
|
||||||
|
|
||||||
|
filter "system:haiku"
|
||||||
|
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN", "_BSD_SOURCE" }
|
||||||
|
links { "network", "bsd" }
|
||||||
|
|
||||||
|
|
||||||
-- optional 3rd party libraries
|
-- optional 3rd party libraries
|
||||||
group "contrib"
|
group "contrib"
|
||||||
|
@ -193,7 +193,7 @@ int getversion(struct OsVersionInfo* info)
|
|||||||
|
|
||||||
/*************************************************************/
|
/*************************************************************/
|
||||||
|
|
||||||
#elif defined(PLATFORM_BSD) || defined(PLATFORM_LINUX) || defined(PLATFORM_SOLARIS) || defined(PLATFORM_HURD)
|
#elif defined(PLATFORM_BSD) || defined(PLATFORM_LINUX) || defined(PLATFORM_SOLARIS) || defined(PLATFORM_HURD) || defined(PLATFORM_HAIKU)
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/utsname.h>
|
#include <sys/utsname.h>
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#define PLATFORM_STRING "windows"
|
#define PLATFORM_STRING "windows"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PLATFORM_POSIX (PLATFORM_LINUX || PLATFORM_BSD || PLATFORM_MACOSX || PLATFORM_SOLARIS)
|
#define PLATFORM_POSIX (PLATFORM_LINUX || PLATFORM_BSD || PLATFORM_MACOSX || PLATFORM_SOLARIS || PLATFORM_HAIKU)
|
||||||
|
|
||||||
|
|
||||||
/* Pull in platform-specific headers required by built-in functions */
|
/* Pull in platform-specific headers required by built-in functions */
|
||||||
|
Loading…
Reference in New Issue
Block a user