[Flightgear-devel] Re: FlightGear ATC problem

[Curtis L. Olson]

Adam submitted a patch to simgear/compiler.h which #defines the 
include location of gl.h, glut.h, and glu.h along with patched files 
that eliminate direct references and #include the #defined symbol 
instead.  This change propogates through simgear and flightgear and 
depricates the FG_GLUT_H symbol in the FlightGear configure.ac script.  
The changes should now all be in CVS.  You will need to cvs update 
both SimGear and FlightGear.  This change allows a clean build 
[hopefully] :-) on OSX and should affect any other platform.

Regards,
Curt.
--
Curtis Olsonhttp://www.flightgear.org/~curt
HumanFIRST Program  http://www.humanfirst.umn.edu/
FlightGear Project  http://www.flightgear.org
Unique text:2f585eeea02e2c79d7b1d8c4963bae2d

Adam Dershowitz wrote:
Here is the list of files, just to help with the paths:
SimGear:
Index: simgear/compiler.h
Index: simgear/scene/material/matlib.cxx
Index: simgear/scene/sky/dome.cxx
Index: simgear/scene/sky/clouds3d/SkyCloud.cpp
Index: simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp
Index: simgear/scene/sky/clouds3d/SkyLight.cpp
Index: simgear/scene/sky/clouds3d/SkyMaterial.hpp
Index: simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp
Index: simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
Index: simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp
Index: simgear/scene/sky/clouds3d/SkyTexture.hpp
Index: simgear/scene/sky/clouds3d/SkyTextureManager.cpp
Index: simgear/scene/sky/clouds3d/glut_shapes.c
Index: simgear/scene/sky/clouds3d/glut_shapes.h
Index: simgear/screen/GLBitmaps.cxx
Index: simgear/screen/extensions.hxx
Index: simgear/screen/screen-dump.cxx
Index: simgear/screen/screen-dump.hxx
Index: simgear/screen/texture.cxx
Index: simgear/screen/texture.hxx
Index: simgear/screen/tr.cxx
Index: simgear/screen/tr.h
Index: simgear/xgl/xgl.h
FlightGear files
Index: src/ATC/ATCdisplay.cxx
Index: src/Cockpit/cockpit.cxx
Index: src/Cockpit/hud.cxx
Index: src/Cockpit/panel.cxx
Index: src/GUI/gui_funcs.cxx
Index: src/GUI/layout-test.cxx
Index: src/Main/fg_os.cxx
Index: src/Main/splash.cxx
Index: src/Network/ATC-Inputs.cxx
Index: src/Time/light.cxx
Index: src/Time/light.hxx
Index: utils/Modeller/3dconvert.cxx
By the way this list includes the version of ATC-Inputs.cxx with the
includes that you suggested, rather than just commented out code, so that it
should work properly.
Thanks for taking care of this.  It will be nice to be able to build on a
Mac from src with no changes.
Please let me, and the developer list, know when you have made these changes
in CVS.
Thanks,
-- Adam
 

___
Flightgear-devel mailing list
[EMAIL PROTECTED]
http://mail.flightgear.org/mailman/listinfo/flightgear-devel
2f585eeea02e2c79d7b1d8c4963bae2d

[Flightgear-devel] Re: FlightGear ATC problem

[ima . sudonim]

The changes should now all be in CVS.  You will need to cvs update
both SimGear and FlightGear.  This change allows a clean build
[hopefully] :-) on OSX and should affect any other platform.
the flightgear tests directory build is broken on mac os x (10.3.6)
Making all in tests
source='est-epsilon.c' object='est-epsilon.o' libtool=no \
depfile='.deps/est-epsilon.Po' tmpdepfile='.deps/est-epsilon.TPo' \
depmode=gcc3 /bin/sh ../depcomp \
gcc -DHAVE_CONFIG_H -I. -I. -I../src/Include   
-I/Users/ima/Desktop/FlightGear/fgdev9.6/include  -g -O2 -D_REENTRANT 
-c `test -f 'est-epsilon.c' || echo './'`est-epsilon.c
est-epsilon.c:13:19: OpenGL/glut.h: No such file or directory
est-epsilon.c: In function `main':
est-epsilon.c:17: error: `GLfloat' undeclared (first use in this 
function)
est-epsilon.c:17: error: (Each undeclared identifier is reported only 
once
est-epsilon.c:17: error: for each function it appears in.)
est-epsilon.c:17: error: parse error before a
est-epsilon.c:19: error: `a' undeclared (first use in this function)
est-epsilon.c:24: error: `t' undeclared (first use in this function)
make[1]: *** [est-epsilon.o] Error 1

a workaround is to skip the tests by building from the makefile in 
src/flightgear/src.

The fix is to modify compiler.h in simgear to contain:
#  define SG_GLUT_H GLUT/glut.h
for __APPLE__
glut.h is in the GLUT.framework on mac os x, not the opengl.framework.  
The other apple specific ones are OK.

Thanks!
Ima
___
Flightgear-devel mailing list
[EMAIL PROTECTED]
http://mail.flightgear.org/mailman/listinfo/flightgear-devel
2f585eeea02e2c79d7b1d8c4963bae2d