[r1547M] Can't compile : using ZDoom revision r4205

[Oddbrother]

Since GZDoom r1547 was built off ZDoom r4204, I replaced the files that changed in ZDoom r4205.

I figured since the change to fix a status bar mugshot wouldn't cause a catastrophe in other ports, I carried the changed files over to GZDoom and compiled. Lo and behold, I was proven wrong, as sdlglvideo.o and probably some other files have something to do with them.

Code: Select all

[ 38%] Building CXX object src/CMakeFiles/zdoom.dir/sdl/sdlglvideo.o
In file included from /gzdoom/src/./gl/textures/gl_material.h:8:0,
                 from /gzdoom/src/sdl/sdlglvideo.cpp:27:
/gzdoom/src/./gl/renderer/gl_colormap.h: In member function ‘void FColormap::GetFixedColormap()’:
/gzdoom/src/./gl/renderer/gl_colormap.h:57:56: warning: enumeral and non-enumeral type in conditional expression [enabled by default]
In file included from /gzdoom/src/sdl/sdlglvideo.cpp:27:0:
/gzdoom/src/./gl/textures/gl_material.h: At global scope:
/gzdoom/src/./gl/textures/gl_material.h:154:15: error: ‘FloatRect’ has not been declared
/gzdoom/src/./gl/textures/gl_material.h:161:15: error: ‘FloatRect’ has not been declared
make[2]: *** [src/CMakeFiles/zdoom.dir/sdl/sdlglvideo.o] Error 1
make[1]: *** [src/CMakeFiles/zdoom.dir/all] Error 2
make: *** [all] Error 2

Compile attempted in Ubuntu Studio 12.10 32-bit

[Rachael]

First off, this was posted in the wrong forum. Experimental builds is something that's been dead for years now. I have gone ahead and moved it to the correct forum for you.

Secondly, you never want to just replace files in SVN, you have to do diff merges. And with a project like GZDoom, even that is not guaranteed, as the GL renderer may require additional tinkering to get everything working again.

Thirdly, I've gone ahead and closed this report, because there's nothing here for developers to fix, unless the problem occurs when they do a diff merge, and if that happens I am sure they'll be on top of it right away.

[Gez]

you never want to just replace files in SVN, you have to do diff merges.

Exactly the cause of your issue here. There are many differences between ZDoom's textures.h and GZDoom's version. By directly copying ZDoom's version, you added one line, and deleted 70 others. Lines which notably include a declaration of FloatRect...