JGR's Patch Pack
Moderator: OpenTTD Developers
Re: JGR's Patch Pack
Dragable Newobjects was discussed in Rubidium's development topic , but I don't think it was ever implemented.
wallyweb on tt-forums: Screenshots - Wallyweb World - Projects & Releases
wallyweb on Simuscape: Projects - Releases
Other Stuff: TTDPatch 2.6 "Nightly" download - cirdan's OpenTTD branch (New Map Features)
Screenshot Of The Month Contest Winner: August 2015 - Tied May 2016 - January 2018 - December 2018 - May 2019
wallyweb on Simuscape: Projects - Releases
Other Stuff: TTDPatch 2.6 "Nightly" download - cirdan's OpenTTD branch (New Map Features)
Screenshot Of The Month Contest Winner: August 2015 - Tied May 2016 - January 2018 - December 2018 - May 2019
Re: JGR's Patch Pack
Hi, this my first post here! Always been a huge TT fan and love the OpenTTD project. Only recently discovered the Patch Packs and have to say that JGR's is by far the most comprehensive one out there. Great work!
I tested the pack on Windows, but am now trying to compile for Mac 10.14. I can compile the latest OpenTTD release without any issues, but am running into a strange issue at configure with JGR.
Reproduction:
I've worked through this topic to research and found a similar issue has occurred a few months back, but that was reported as being fixed: https://github.com/OpenTTD/OpenTTD/issues/6773
Any tips are very welcome! Thanks again for the lovely work here!
EDIT: this might have already been fixed: https://github.com/JGRennison/OpenTTD-p ... f59d14e72d - testing this now
EDIT2: good news, the above fix does work and configure now works fine. The bad news is that the compile fails, see the code below. Any tips are still very welcome
I tested the pack on Windows, but am now trying to compile for Mac 10.14. I can compile the latest OpenTTD release without any issues, but am running into a strange issue at configure with JGR.
Code: Select all
configure: error: clang version is too old: Apple LLVM version 10.0.0 (clang-1000.11.45.5), minumum: 3.3
Code: Select all
git clone git://github.com/JGRennison/OpenTTD-patches.git
./configure --enable-static --without-liblzo2
Any tips are very welcome! Thanks again for the lovely work here!
EDIT: this might have already been fixed: https://github.com/JGRennison/OpenTTD-p ... f59d14e72d - testing this now
EDIT2: good news, the above fix does work and configure now works fine. The bad news is that the compile fails, see the code below. Any tips are still very welcome
Code: Select all
In file included from /Users/arbr2/OpenTTD-patches/src/video/cocoa/event.mm:33:
In file included from /Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/factory.hpp:15:
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:4: warning: 'auto' type specifier is a C++11 extension [-Wc++11-extensions]
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:25: error: expected expression
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:27: error: unexpected type name 'int64': expected expression
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:43: error: expected '(' for function-style cast or type construction
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
~~~ ^
In file included from /Users/arbr2/OpenTTD-patches/src/video/cocoa/cocoa_v.mm:33:
In file included from /Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/factory.hpp:15:
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:4: warning: 'auto' type specifier is a C++11 extension [-Wc++11-extensions]
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:25: error: expected expression
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:27: error: unexpected type name 'int64': expected expression
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:43: error: expected '(' for function-style cast or type construction
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
~~~ ^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:44: error: use of undeclared identifier 'y_bound'
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:56: error: expected unqualified-id
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:4: warning: 'auto' type specifier is a C++11 extension [-Wc++11-extensions]
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:25: error: expected expression
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:27: error: unexpected type name 'int64': expected expression
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:43: error: expected '(' for function-style cast or type construction
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
~~~ ^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:44: error: use of undeclared identifier 'y_bound'
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:320:56: error: expected unqualified-id
auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:4: warning: 'auto' type specifier is a C++11 extension [-Wc++11-extensions]
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:25: error: expected expression
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:27: error: unexpected type name 'int64': expected expression
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:43: error: expected '(' for function-style cast or type construction
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
~~~ ^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:44: error: use of undeclared identifier 'x_bound'
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:56: error: expected unqualified-id
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:44: error: use of undeclared identifier 'x_bound'
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
/Users/arbr2/OpenTTD-patches/src/video/cocoa/../../blitter/base.hpp:382:56: error: expected unqualified-id
auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
^
8 warnings and 10 errors generated.
make[1]: *** [video/cocoa/cocoa_v.o] Error 1
make: *** [all] Error 1
Re: JGR's Patch Pack
I'm going to guess that you're running a newer version of C++, and not C++11.arbr2 wrote:warning: 'auto' type specifier is a C++11 extension [-Wc++11-extensions]
Do you like drones, quadcopters & flying toys? Check out Drone Strike Force!
Base Music Sets: OpenMSX | Scott Joplin Anthology | Traditional Winter Holiday Music | Modern Motion Music
Other Projects: 2CC Trams | Modern Waypoints | Sprite Sandbox & NewGRF Releases | Ideabox | Town Names | Isle of Sodor Scenario | Random Sprite Repository
Misc Topics: My Screenshots | Forgotten NewGRFs | Unfinished Graphics Sets | Stats Shack | GarryG's Auz Sets
Base Music Sets: OpenMSX | Scott Joplin Anthology | Traditional Winter Holiday Music | Modern Motion Music
Other Projects: 2CC Trams | Modern Waypoints | Sprite Sandbox & NewGRF Releases | Ideabox | Town Names | Isle of Sodor Scenario | Random Sprite Repository
Misc Topics: My Screenshots | Forgotten NewGRFs | Unfinished Graphics Sets | Stats Shack | GarryG's Auz Sets
- andythenorth
- Tycoon
- Posts: 5658
- Joined: 31 Mar 2007 14:23
- Location: Lost in Music
Re: JGR's Patch Pack
You might also need https://github.com/OpenTTD/OpenTTD/pull/6917
FIRS Industry Replacement Set (released) | HEQS Heavy Equipment Set (trucks, industrial trams and more) (finished)
Unsinkable Sam (ships) (preview released) | CHIPS Has Improved Players' Stations (finished)
Iron Horse ((trains) (released) | Termite (tracks for Iron Horse) (released) | Busy Bee (game script) (released)
Road Hog (road vehicles and trams) (released)
Unsinkable Sam (ships) (preview released) | CHIPS Has Improved Players' Stations (finished)
Iron Horse ((trains) (released) | Termite (tracks for Iron Horse) (released) | Busy Bee (game script) (released)
Road Hog (road vehicles and trams) (released)
Re: JGR's Patch Pack
That's a great tip, but it seems these have already been applied to the JGR patch pack as well over the last few days. I'm not that great at git, so maybe i'm missing something here. As far as I can tell these fixes have been applied, but I still get this message on configure of the jgrpp branch:andythenorth wrote:You might also need https://github.com/OpenTTD/OpenTTD/pull/6917
Code: Select all
configure: error: clang version is too old: Apple LLVM version 10.0.0 (clang-1000.11.45.5), minumum: 3.3
I don't really understand why the jgrpp branch won't configure, because it should use the exact same config.lib file with all the fixes as they are in the master branch. I can even see the correct config.lib being present in the jgrpp branch, but it still shows the error above. Sorry for being such a git-noob
Re: JGR's Patch Pack
I cranked up my Git Clone to pull 29.0.
My MinGW choked on it.
So I went to the source:
Here is the choke:
So then I went here:
Seems something broke sometime between January 2 and January 7.
My MinGW choked on it.
So I went to the source:
Retried MinGW . Rechoked.JGR wrote: Source:
The source is on GitHub. Many features/patches have their own branch(es).
(A SVN-style diff is no longer provided, please use git/GitHub to acquire the source).
Here is the choke:
Code: Select all
$ make bundle
make[1]: Entering directory `/usr/home/Wall/1_JGR/1_Compile/Fg/objs/lang'
[LANG] Compiling core/alloc_func.cpp
C:/MinGW/msys/1.0/home/Wall/1_JGR/1_Compile/Fg/src/core/alloc_func.cpp: In funct
ion 'void MallocError(size_t)':
C:/MinGW/msys/1.0/home/Wall/1_JGR/1_Compile/Fg/src/core/alloc_func.cpp:22:68: wa
rning: use of 'I' length modifier with 'u' type character has either no effect o
r undefined behavior [-Wformat=]
error("Out of memory. Cannot allocate " PRINTF_SIZE " bytes", size);
^
C:/MinGW/msys/1.0/home/Wall/1_JGR/1_Compile/Fg/src/core/alloc_func.cpp: In funct
ion 'void ReallocError(size_t)':
C:/MinGW/msys/1.0/home/Wall/1_JGR/1_Compile/Fg/src/core/alloc_func.cpp:31:70: wa
rning: use of 'I' length modifier with 'u' type character has either no effect o
r undefined behavior [-Wformat=]
error("Out of memory. Cannot reallocate " PRINTF_SIZE " bytes", size);
^
[LANG] Compiling string.cpp
C:/MinGW/msys/1.0/home/Wall/1_JGR/1_Compile/Fg/src/string.cpp: In function 'char
* strcasestr(const char*, const char*)':
C:/MinGW/msys/1.0/home/Wall/1_JGR/1_Compile/Fg/src/string.cpp:603:47: error: 'st
rncasecmp' was not declared in this scope
if (strncasecmp(haystack, needle, needle_len) == 0) return const_cast<char *>
(haystack);
^
make[1]: *** [string.o] Error 1
make[1]: Leaving directory `/usr/home/Wall/1_JGR/1_Compile/Fg/objs/lang'
make: *** [all] Error 1
This one's source is compiling fine.Previous releases:
Source and binary zips for previous (and the current) releases are also on GitHub.
Seems something broke sometime between January 2 and January 7.
wallyweb on tt-forums: Screenshots - Wallyweb World - Projects & Releases
wallyweb on Simuscape: Projects - Releases
Other Stuff: TTDPatch 2.6 "Nightly" download - cirdan's OpenTTD branch (New Map Features)
Screenshot Of The Month Contest Winner: August 2015 - Tied May 2016 - January 2018 - December 2018 - May 2019
wallyweb on Simuscape: Projects - Releases
Other Stuff: TTDPatch 2.6 "Nightly" download - cirdan's OpenTTD branch (New Map Features)
Screenshot Of The Month Contest Winner: August 2015 - Tied May 2016 - January 2018 - December 2018 - May 2019
Re: JGR's Patch Pack
I will look into the issues around building on windows and OSX shortly.
There were some recent upstream changes in this area.
There were some recent upstream changes in this area.
Ex TTDPatch Coder
Patch Pack, Github
Patch Pack, Github
Re: JGR's Patch Pack
arbr2 wrote:Hi, this my first post here! Always been a huge TT fan and love the OpenTTD project. Only recently discovered the Patch Packs and have to say that JGR's is by far the most comprehensive one out there. Great work!
I tested the pack on Windows, but am now trying to compile for Mac 10.14. I can compile the latest OpenTTD release without any issues, but am running into a strange issue at configure with JGR.
Could you try again with the most recent commit?wallyweb wrote:I cranked up my Git Clone to pull 29.0.
My MinGW choked on it.
Ex TTDPatch Coder
Patch Pack, Github
Patch Pack, Github
Re: JGR's Patch Pack
That seemed to work. The game opened as OpenTTD jgrpp-0.29.0-65-ge3d167fJGR wrote:arbr2 wrote:Hi, this my first post here! Always been a huge TT fan and love the OpenTTD project. Only recently discovered the Patch Packs and have to say that JGR's is by far the most comprehensive one out there. Great work!
I tested the pack on Windows, but am now trying to compile for Mac 10.14. I can compile the latest OpenTTD release without any issues, but am running into a strange issue at configure with JGR.Could you try again with the most recent commit?wallyweb wrote:I cranked up my Git Clone to pull 29.0.
My MinGW choked on it.
wallyweb on tt-forums: Screenshots - Wallyweb World - Projects & Releases
wallyweb on Simuscape: Projects - Releases
Other Stuff: TTDPatch 2.6 "Nightly" download - cirdan's OpenTTD branch (New Map Features)
Screenshot Of The Month Contest Winner: August 2015 - Tied May 2016 - January 2018 - December 2018 - May 2019
wallyweb on Simuscape: Projects - Releases
Other Stuff: TTDPatch 2.6 "Nightly" download - cirdan's OpenTTD branch (New Map Features)
Screenshot Of The Month Contest Winner: August 2015 - Tied May 2016 - January 2018 - December 2018 - May 2019
Re: JGR's Patch Pack
Still hitting this issue in 0.29.0JGR wrote:Thanks for letting me know about this, I've pushed an update which should resolve this.kamnet wrote:Tried out 0.28.0 and started to crash, also crashing with 0.27.1.
Only thing I've changed is that I've maxed out NewGRFs (255 in-game, and 4 static).
Here's the dump files if you want to take a look.
edit: After experimenting for a few hours, I think I've found something interesting. The game will load with 242 NewGRFs. Any more than that and it will crash upon game creation. This also appears to include static NewGRFs.
I will do some more checking on due course though.
Do you like drones, quadcopters & flying toys? Check out Drone Strike Force!
Base Music Sets: OpenMSX | Scott Joplin Anthology | Traditional Winter Holiday Music | Modern Motion Music
Other Projects: 2CC Trams | Modern Waypoints | Sprite Sandbox & NewGRF Releases | Ideabox | Town Names | Isle of Sodor Scenario | Random Sprite Repository
Misc Topics: My Screenshots | Forgotten NewGRFs | Unfinished Graphics Sets | Stats Shack | GarryG's Auz Sets
Base Music Sets: OpenMSX | Scott Joplin Anthology | Traditional Winter Holiday Music | Modern Motion Music
Other Projects: 2CC Trams | Modern Waypoints | Sprite Sandbox & NewGRF Releases | Ideabox | Town Names | Isle of Sodor Scenario | Random Sprite Repository
Misc Topics: My Screenshots | Forgotten NewGRFs | Unfinished Graphics Sets | Stats Shack | GarryG's Auz Sets
Re: JGR's Patch Pack
It's me, again
Any suggestions to a compiling-newbie?
Code: Select all
[LANG] Compiling core/alloc_func.cpp
In file included from /Users/.../OpenTTD-patches/src/core/alloc_func.cpp:12:
In file included from /Users/.../OpenTTD-patches/src/core/../stdafx.h:16:
/Users/.../OpenTTD-patches/src/core/../os/macosx/osx_stdafx.h:17:10: fatal error:
'AvailabilityMacros.h' file not found
#include <AvailabilityMacros.h>
^~~~~~~~~~~~~~~~~~~~~~
1 error generated.
make[1]: *** [alloc_func.o] Error 1
make: *** [all] Error 1
Re: JGR's Patch Pack
Thanks for letting me know, can you try the most recent commit?kamnet wrote:Tried out 0.28.0 and started to crash, also crashing with 0.27.1.
Only thing I've changed is that I've maxed out NewGRFs (255 in-game, and 4 static).
Here's the dump files if you want to take a look.
Googling seems to suggest that you need to run:Ro(V)eO wrote:It's me, again
Any suggestions to a compiling-newbie?Code: Select all
[LANG] Compiling core/alloc_func.cpp In file included from /Users/.../OpenTTD-patches/src/core/alloc_func.cpp:12: In file included from /Users/.../OpenTTD-patches/src/core/../stdafx.h:16: /Users/.../OpenTTD-patches/src/core/../os/macosx/osx_stdafx.h:17:10: fatal error: 'AvailabilityMacros.h' file not found #include <AvailabilityMacros.h> ^~~~~~~~~~~~~~~~~~~~~~ 1 error generated. make[1]: *** [alloc_func.o] Error 1 make: *** [all] Error 1
Code: Select all
xcode-select --install
Ex TTDPatch Coder
Patch Pack, Github
Patch Pack, Github
Re: JGR's Patch Pack
Nope, xcode is installed, as well as the command line tools...JGR wrote: Googling seems to suggest that you need to run:, I don't have a mac so can't verify though.Code: Select all
xcode-select --install
edit: installing SDK Headers seem to solve the problem, appearing on OSX Mojave. Running make now without issues
used this code line i found on github:
Code: Select all
open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
Re: JGR's Patch Pack
Can you maybe share how your ./configure looks? I'm running Mojave too and the compile still seems to fail here.Ro(V)eO wrote:JGR wrote: edit: installing SDK Headers seem to solve the problem, appearing on OSX Mojave. Running make now without issues
used this code line i found on github:Code: Select all
open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
I'm using:
Code: Select all
./configure --enable-static --without-liblzo2 --without-freetype
Re: JGR's Patch Pack
First of all: thanks for all your hard work on the patch pack and supporting us all here, it's really appreciated.JGR wrote:Could you try again with the most recent commit?
The new commits do seem to solve the configure errors that show Clang is out of date. Compiling starts out great, just a couple of warnings here and there that's shouldn't really be an issue. However, the compiling still fails at the exact same point as before:
I'm on Mac OS Mojave and have installed Xcode (including command line tools) and tried the suggestion for the headers SDK above. As stated above I configure using:
Code: Select all
./configure --enable-static --without-liblzo2 --without-freetype
Re: JGR's Patch Pack
It seems like C++11 syntax is being used, and you're not compiling with that standard.
Re: JGR's Patch Pack
Would the syntax differ from the master branch? Because that compiles just fine and I would expect it to use the same syntax.Gliptal wrote:It seems like C++11 syntax is being used, and you're not compiling with that standard.
Do you have any tips on how I can compile with C++11 syntax?
Re: JGR's Patch Pack
You're on MAC right? If you're using XCode's GUI there must be an option somewhere to choose the languge dialect. If you're using the command line (which should be clang) the flag to add isarbr2 wrote:Would the syntax differ from the master branch? Because that compiles just fine and I would expect it to use the same syntax.Gliptal wrote:It seems like C++11 syntax is being used, and you're not compiling with that standard.
Do you have any tips on how I can compile with C++11 syntax?
Code: Select all
-std=c++11
Re: JGR's Patch Pack
Yes, I'm on Mac running the latest MacOS version 10.14.2.Gliptal wrote:If you're using the command line (which should be clang) the flag to add is. I may be entirely off base here, but those look like syntax errors and there are references to C++11 feautures in the warnings.Code: Select all
-std=c++11
It seems clang is already using this syntax by default. This is how part of the response looks like when I configure before compiling:
Code: Select all
using CXXFLAGS... -std=c++11
using LDFLAGS... -lstdc++ -lc -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -lz -L/usr/local/Cellar/xz/5.2.4/lib -llzma -D_THREAD_SAFE -pthread -liconv -rdynamic -framework Cocoa
Re: JGR's Patch Pack
Well actually, after compiling (which runs with several errors, but seems to finish) I was able to make the bundle. But when trying to start the file, i got an error telling me that OpenTTD wouldn't run on my Mac...
edit:
That's my configuration. I'll try with C++11, maybe THIS works...
e2: Compiling seemed to work, but still the same message when trying to run
with "make run", i get this:
edit:
Code: Select all
./configure --enable-static --cpu-type=64 LDFLAGS="-stdlib=libstdc++"
e2: Compiling seemed to work, but still the same message when trying to run
with "make run", i get this:
Code: Select all
...$ sudo make run
/Applications/Xcode.app/Contents/Developer/usr/bin/make reconfigure
make[1]: `reconfigure' is up to date.
/bin/sh: ./openttd: Permission denied
make: *** [run] Error 126
Who is online
Users browsing this forum: No registered users and 44 guests