Warmonger, lets make develop branch history linear. Please do not merge upstream develop to your local develop use pull fast-forward only or rebase local changes.
This is different question.(Also, I do not care about branches.) As for me I rebase small and my own branches and merge large long-term branches and branches with more than one contributor.
I recently tried to compile VCMI via MinGW/CMake and encountered this error:
1%] Built target minizip
1%] Building CXX object lib/CMakeFiles/vcmi.dir/filesystem/FileStream.cpp.obj
D:\C++\VCMI_BUILD\VCMI\Source\lib\filesystem\FileStream.cpp: In function 'void* fopen64_file_func(voidpf, const void*, int)':
D:\C++\VCMI_BUILD\VCMI\Source\lib\filesystem\FileStream.cpp:22:58: error: 'fopen64' was not declared in this scope
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
^
D:\C++\VCMI_BUILD\VCMI\Source\lib\filesystem\FileStream.cpp: In function 'fpos_t ftell64_file_func(voidpf, voidpf)':
D:\C++\VCMI_BUILD\VCMI\Source\lib\filesystem\FileStream.cpp:23:44: error: 'ftello64' was not declared in this scope
#define FTELLO_FUNC(stream) ftello64(stream)
^
D:\C++\VCMI_BUILD\VCMI\Source\lib\filesystem\FileStream.cpp: In function 'long int fseek64_file_func(voidpf, voidpf, fpos_t, int)':
D:\C++\VCMI_BUILD\VCMI\Source\lib\filesystem\FileStream.cpp:24:76: error: 'fseeko64' was not declared in this scope
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
^
lib\CMakeFiles\vcmi.dir\build.make:357: recipe for target 'lib/CMakeFiles/vcmi.dir/filesystem/FileStream.cpp.obj' failed
mingw32-make[2]: *** [lib/CMakeFiles/vcmi.dir/filesystem/FileStream.cpp.obj] Error 1
CMakeFiles\Makefile2:139: recipe for target 'lib/CMakeFiles/vcmi.dir/all' failed
mingw32-make[1]: *** [lib/CMakeFiles/vcmi.dir/all] Error 2
Makefile:148: recipe for target 'all' failed
mingw32-make: *** [all] Error 2
I’m currently using gcc 5.1.0, but if there is newer version I’ll certainly update it, thanks.
BTW, I didn’t install Qt5 package, which is needed just by launcher (if I’m not mistaken), and version 5.1.0 of gcc seems to be still the latest one for windows.
Hmm, honestly I don’t know how to figure it out . I’m using TDM-GCC package, which has required toolchain included. For now I managed to get version of mingw32-make, which is 3.82.90; in other hand headers and libraries are from version 3.20.
We never had problem with that before, but I think it’s would be handy to make it impossible to damage develop accidentally. Important for me since I’m sometimes force push to my branches and each time it’s give me similar feeling like using “rm -rf” do.