Fix: Fix build and link using Cygwin and Mingw32 for Windows 7 x64 #7763
+30
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix the following compile errors:
In file included from openttd/src/debug.h:15:0,
from openttd/src/string.cpp:13:
openttd/src/cpu.h:35:19: error: 'uint' was not declared in this scope
bool HasCPUIDFlag(uint type, uint index, uint bit);
openttd/src/string.cpp: In function 'char* strcasestr(const char*, const char*)':
openttd/src/string.cpp:548:7: error: 'strncasecmp' was not declared in this scope
if (strncasecmp(haystack, needle, needle_len) == 0) return const_cast<char *>(haystack);
openttd/src/strgen/strgen_base.cpp: In function 'void EmitPlural(Buffer*, char*, int)':
openttd/src/core/alloc_func.hpp:136:6: error: 'alloca' was not declared in this scope
(T*)alloca((num_elements) * sizeof(T)))
Signed-off-by: Joe Stringer <joe@wand.net.nz>
src/depend/depend.cpp: In constructor 'File::File(const char*)':
src/depend/depend.cpp:170:19: error: 'strdup' was not declared in this scope
this->dirname = strdup(filename);
^~~~~~
Signed-off-by: Joe Stringer <joe@wand.net.nz>
Fixes the following complaints: src/network/core/address.cpp: In member function 'const sockaddr_storage* NetworkAddress::GetAddress()': src/network/core/address.cpp:134:55: error: 'AI_ADDRCONFIG' was not declared in this scope this->Resolve(this->address.ss_family, SOCK_STREAM, AI_ADDRCONFIG, nullptr, ResolveLoopProc); Signed-off-by: Joe Stringer <joe@wand.net.nz>
Prior to this commit, the following is observed when running openttd.exe that was compiled using mingw32 on x86_64: > The procedure entry point ScriptBreak could not be located in the dynamic link library GDI32.dll The MSDN docs at the below link state that modules using Uniscribe must first link against usp10 before gdi32 to avoid this issue: https://msdn.microsoft.com/en-us/library/windows/desktop/dd319118(v=vs.85).aspx Signed-off-by: Joe Stringer <joe@wand.net.nz>
|
MSYS2/MinGW_W64 still works. |
LordAro
approved these changes
Oct 7, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have a local Cygwin environment which I've been attempting to use to compile OpenTTD using the Mingw32 toolchain that you can install via the cygwin installer.
With all of the necessary components installed via the mingw32 variations (including lzma, which was hiding in the
mingw64-x86_64-xzpackage), I configure and build like so:(To launch successfully I had to create a bundle and launch it from the bundle directory,
make installdoesn't work... but that's minor)This series of commits fix the build issues and a startup DLL error with gdi32 which prevented compile and launch of OpenTTD on my Windows 7 x64 environment. For more details, see the individual commit messages.