mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-26 14:54:20 +08:00
71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
diff -rupNw source-original/config.lib source/config.lib
|
|
--- source-original/config.lib 2018-11-23 19:25:11.000000000 +0100
|
|
+++ source/config.lib 2018-11-23 21:37:19.956620161 +0100
|
|
@@ -1486,7 +1486,7 @@ make_cflags_and_ldflags() {
|
|
# Special CXXFlags for HOST
|
|
CXXFLAGS="$CXXFLAGS"
|
|
# Libs to compile. In fact this is just LDFLAGS
|
|
- LIBS="-lstdc++"
|
|
+ LIBS="-lstdc++ -lSDL -lorbital"
|
|
# LDFLAGS used for HOST
|
|
LDFLAGS="$LDFLAGS"
|
|
# FEATURES for HOST (lto)
|
|
@@ -1594,7 +1594,7 @@ make_cflags_and_ldflags() {
|
|
fi
|
|
|
|
if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
|
|
- LIBS="$LIBS -lpthread"
|
|
+ LIBS="$LIBS"
|
|
fi
|
|
|
|
if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ]; then
|
|
diff -rupNw source-original/src/os/unix/unix.cpp source/src/os/unix/unix.cpp
|
|
--- source-original/src/os/unix/unix.cpp 2018-11-23 19:25:12.000000000 +0100
|
|
+++ source/src/os/unix/unix.cpp 2018-11-23 21:37:19.956620161 +0100
|
|
@@ -28,7 +28,7 @@
|
|
#ifdef __APPLE__
|
|
#include <sys/mount.h>
|
|
#elif (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) || defined(__GLIBC__)
|
|
- #define HAS_STATVFS
|
|
+ //#define HAS_STATVFS
|
|
#endif
|
|
|
|
#if defined(OPENBSD) || defined(__NetBSD__) || defined(__FreeBSD__)
|
|
diff -rupNw source-original/src/rev.cpp.in source/src/rev.cpp.in
|
|
--- source-original/src/rev.cpp.in 2018-11-23 19:25:12.000000000 +0100
|
|
+++ source/src/rev.cpp.in 2018-11-23 21:37:19.956620161 +0100
|
|
@@ -57,7 +57,7 @@ const char _openttd_build_date[] = __DAT
|
|
* (compiling from sources without any version control software)
|
|
* and 2 is for modified revision.
|
|
*/
|
|
-const byte _openttd_revision_modified = !!MODIFIED!!;
|
|
+const byte _openttd_revision_modified = 2;
|
|
|
|
/**
|
|
* The NewGRF revision of OTTD:
|
|
diff -rupNw source-original/src/stdafx.h source/src/stdafx.h
|
|
--- source-original/src/stdafx.h 2018-11-23 19:25:12.000000000 +0100
|
|
+++ source/src/stdafx.h 2018-11-23 19:49:25.000000000 +0100
|
|
@@ -12,6 +12,9 @@
|
|
#ifndef STDAFX_H
|
|
#define STDAFX_H
|
|
|
|
+#include <strings.h>
|
|
+#include <alloca.h>
|
|
+
|
|
#if defined(__APPLE__)
|
|
#include "os/macosx/osx_stdafx.h"
|
|
#endif /* __APPLE__ */
|
|
diff -rupNw source-original/src/string.cpp source/src/string.cpp
|
|
--- source-original/src/string.cpp 2018-11-23 19:25:12.000000000 +0100
|
|
+++ source/src/string.cpp 2018-11-23 20:01:10.000000000 +0100
|
|
@@ -528,7 +528,7 @@ size_t Utf8TrimString(char *s, size_t ma
|
|
return length;
|
|
}
|
|
|
|
-#ifdef DEFINE_STRCASESTR
|
|
+#if 0
|
|
char *strcasestr(const char *haystack, const char *needle)
|
|
{
|
|
size_t hay_len = strlen(haystack);
|