Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
cookbook
Commits
8605082c
Verified
Commit
8605082c
authored
5 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Fix openttd
parent
f84eb0c2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
recipes/openttd/01_redox.patch
+35
-25
35 additions, 25 deletions
recipes/openttd/01_redox.patch
with
35 additions
and
25 deletions
recipes/openttd/01_redox.patch
+
35
−
25
View file @
8605082c
diff -rupNw source/config.lib source-new/config.lib
diff -ruw source/config.lib source-new/config.lib
--- source/config.lib 2019-03-04 21:01:49.523053923 +0100
--- source/config.lib 2019-06-19 08:34:01.122040101 -0600
+++ source-new/config.lib 2019-03-04 21:00:15.870317336 +0100
+++ source-new/config.lib 2019-06-27 16:41:18.749553078 -0600
@@ -1486,7 +1486,7 @@
make_cflags_and_ldflags() {
@@ -1458,7 +1458,8 @@
fi
fi
- has_rdynamic=`$1 -dumpspecs | grep rdynamic`
+ #TODO has_rdynamic=`$1 -dumpspecs | grep rdynamic`
+ has_rdynamic=""
if [ -n "$has_rdynamic" ]; then
# rdynamic is used to get useful stack traces from crash reports.
flags="$flags -rdynamic"
@@ -1486,7 +1487,7 @@
# Special CXXFlags for HOST
# Special CXXFlags for HOST
CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS"
# Libs to compile. In fact this is just LDFLAGS
# Libs to compile. In fact this is just LDFLAGS
...
@@ -10,10 +20,10 @@ diff -rupNw source/config.lib source-new/config.lib
...
@@ -10,10 +20,10 @@ diff -rupNw source/config.lib source-new/config.lib
# LDFLAGS used for HOST
# LDFLAGS used for HOST
LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS"
# FEATURES for HOST (lto)
# FEATURES for HOST (lto)
diff -ru
pN
w source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
diff -ruw source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
--- source/src/music/extmidi.cpp 2019-0
3-04 21:01:49.899056924 +01
00
--- source/src/music/extmidi.cpp 2019-0
6-19 08:34:01.278040813 -06
00
+++ source-new/src/music/extmidi.cpp 2019-0
3-04 21:00:15.886317459 +01
00
+++ source-new/src/music/extmidi.cpp 2019-0
6-27 16:39:06.400266392 -06
00
@@ -115,7 +115,11 @@
void MusicDriver_ExtMidi::DoPlay()
@@ -115,7 +115,11 @@
switch (this->pid) {
switch (this->pid) {
case 0: {
case 0: {
close(0);
close(0);
...
@@ -25,10 +35,10 @@ diff -rupNw source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
...
@@ -25,10 +35,10 @@ diff -rupNw source/src/music/extmidi.cpp source-new/src/music/extmidi.cpp
if (d != -1 && dup2(d, 1) != -1 && dup2(d, 2) != -1) {
if (d != -1 && dup2(d, 1) != -1 && dup2(d, 2) != -1) {
execvp(this->params[0], this->params);
execvp(this->params[0], this->params);
}
}
diff -ru
pN
w source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
diff -ruw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
--- source/src/os/unix/unix.cpp 2019-0
3-04 21:01:49.915057051 +01
00
--- source/src/os/unix/unix.cpp 2019-0
6-19 08:34:01.294040885 -06
00
+++ source-new/src/os/unix/unix.cpp 2019-0
3-04 20:20:35.800062835 +01
00
+++ source-new/src/os/unix/unix.cpp 2019-0
6-27 16:39:06.400266392 -06
00
@@ -69,12 +69,12 @@
ULONG __stack = (1024*1024)*2; // maybe
@@ -69,12 +69,12 @@
bool FiosIsRoot(const char *path)
bool FiosIsRoot(const char *path)
{
{
...
@@ -44,7 +54,7 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
...
@@ -44,7 +54,7 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
#endif
#endif
}
}
@@ -106,10 +106,10 @@
bool FiosIsValidFile(const char *path, c
@@ -106,10 +106,10 @@
{
{
char filename[MAX_PATH];
char filename[MAX_PATH];
int res;
int res;
...
@@ -58,7 +68,7 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
...
@@ -58,7 +68,7 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
} else // XXX - only next line!
} else // XXX - only next line!
#else
#else
assert(path[strlen(path) - 1] == PATHSEPCHAR);
assert(path[strlen(path) - 1] == PATHSEPCHAR);
@@ -370,7 +370,7 @@
void OSOpenBrowser(const char *url)
@@ -370,7 +370,7 @@
if (child_pid != 0) return;
if (child_pid != 0) return;
const char *args[3];
const char *args[3];
...
@@ -67,10 +77,10 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
...
@@ -67,10 +77,10 @@ diff -rupNw source/src/os/unix/unix.cpp source-new/src/os/unix/unix.cpp
args[1] = url;
args[1] = url;
args[2] = NULL;
args[2] = NULL;
execvp(args[0], const_cast<char * const *>(args));
execvp(args[0], const_cast<char * const *>(args));
diff -ru
pN
w source/src/rev.cpp.in source-new/src/rev.cpp.in
diff -ruw source/src/rev.cpp.in source-new/src/rev.cpp.in
--- source/src/rev.cpp.in 2019-0
3-04 21:01:49.923057115 +01
00
--- source/src/rev.cpp.in 2019-0
6-19 08:34:01.298040904 -06
00
+++ source-new/src/rev.cpp.in 2019-0
3-04 21:00:15.922317739 +01
00
+++ source-new/src/rev.cpp.in 2019-0
6-27 16:39:06.400266392 -06
00
@@ -57,7 +57,7 @@
const char _openttd_build_date[] = __DAT
@@ -57,7 +57,7 @@
* (compiling from sources without any version control software)
* (compiling from sources without any version control software)
* and 2 is for modified revision.
* and 2 is for modified revision.
*/
*/
...
@@ -79,9 +89,9 @@ diff -rupNw source/src/rev.cpp.in source-new/src/rev.cpp.in
...
@@ -79,9 +89,9 @@ diff -rupNw source/src/rev.cpp.in source-new/src/rev.cpp.in
/**
/**
* The NewGRF revision of OTTD:
* The NewGRF revision of OTTD:
diff -ru
pN
w source/src/stdafx.h source-new/src/stdafx.h
diff -ruw source/src/stdafx.h source-new/src/stdafx.h
--- source/src/stdafx.h 2019-0
3-04 21:01:49.955057370 +01
00
--- source/src/stdafx.h 2019-0
6-19 08:34:01.334041067 -06
00
+++ source-new/src/stdafx.h 2019-0
3-04 21:00:15.930317800 +01
00
+++ source-new/src/stdafx.h 2019-0
6-27 16:39:06.400266392 -06
00
@@ -12,6 +12,9 @@
@@ -12,6 +12,9 @@
#ifndef STDAFX_H
#ifndef STDAFX_H
#define STDAFX_H
#define STDAFX_H
...
@@ -92,10 +102,10 @@ diff -rupNw source/src/stdafx.h source-new/src/stdafx.h
...
@@ -92,10 +102,10 @@ diff -rupNw source/src/stdafx.h source-new/src/stdafx.h
#if defined(__APPLE__)
#if defined(__APPLE__)
#include "os/macosx/osx_stdafx.h"
#include "os/macosx/osx_stdafx.h"
#endif /* __APPLE__ */
#endif /* __APPLE__ */
diff -ru
pN
w source/src/string.cpp source-new/src/string.cpp
diff -ruw source/src/string.cpp source-new/src/string.cpp
--- source/src/string.cpp 2019-0
3-04 21:01:49.955057370 +01
00
--- source/src/string.cpp 2019-0
6-19 08:34:01.334041067 -06
00
+++ source-new/src/string.cpp 2019-0
3-04 21:00:15.938317862 +01
00
+++ source-new/src/string.cpp 2019-0
6-27 16:39:06.400266392 -06
00
@@ -528,7 +528,7 @@
size_t Utf8TrimString(char *s, size_t ma
@@ -528,7 +528,7 @@
return length;
return length;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment