fly/flightgear
1
0
Fork 0
Code Activity

Pui -> PUI, Gui -> GUI.

Browse source
This commit is contained in:
curt 1998-06-12 14:27:25 +00:00
parent 0afa16ce3a
commit 28ceab0457
6 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
GUI/Makefile.am
View file

@ -1,5 +1,5 @@
noinst_LIBRARIES = libGui.a noinst_LIBRARIES = libGUI.a
libGui_a_SOURCES = gui.cxx gui.h libGUI_a_SOURCES = gui.cxx gui.h
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator

2
GUI/gui.h
View file

@ -26,7 +26,7 @@
#ifndef _GUI_H_ #ifndef _GUI_H_
#define _GUI_H_ #define _GUI_H_
#include "Pui/pu.h" #include "PUI/pu.h"
extern puMenuBar *mainMenuBar; extern puMenuBar *mainMenuBar;
extern puButton *hideMenuButton; extern puButton *hideMenuButton;

17
Main/GLUTkey.cxx
View file

@ -40,9 +40,9 @@
#include <Aircraft/aircraft.h> #include <Aircraft/aircraft.h>
#include <Autopilot/autopilot.h> // Added autopilot.h to list, Jeff Goeke-Smith #include <Autopilot/autopilot.h> // Added autopilot.h to list, Jeff Goeke-Smith
#include <Debug/fg_debug.h> #include <Debug/fg_debug.h>
#include <Gui/gui.h> #include <GUI/gui.h>
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
#include <Pui/pu.h> #include <PUI/pu.h>
#include <Weather/weather.h> #include <Weather/weather.h>
#include "GLUTkey.hxx" #include "GLUTkey.hxx"
@ -290,12 +290,15 @@ void GLUTspecialkey(int k, int x, int y) {
/* $Log$ /* $Log$
/* Revision 1.11 1998/06/12 00:57:38 curt /* Revision 1.12 1998/06/12 14:27:26 curt
/* Added support for Pui/Gui. /* Pui -> PUI, Gui -> GUI.
/* Converted fog to GL_FOG_EXP2.
/* Link to static simulator parts.
/* Update runfg.bat to try to be a little smarter.
/* /*
* Revision 1.11 1998/06/12 00:57:38 curt
* Added support for Pui/Gui.
* Converted fog to GL_FOG_EXP2.
* Link to static simulator parts.
* Update runfg.bat to try to be a little smarter.
*
* Revision 1.10 1998/05/27 02:24:05 curt * Revision 1.10 1998/05/27 02:24:05 curt
* View optimizations by Norman Vine. * View optimizations by Norman Vine.
* *

7
Main/GLUTmain.cxx
View file

@ -58,12 +58,12 @@
#include <Cockpit/cockpit.hxx> #include <Cockpit/cockpit.hxx>
#include <Debug/fg_debug.h> #include <Debug/fg_debug.h>
#include <Gui/gui.h> #include <GUI/gui.h>
#include <Joystick/joystick.h> #include <Joystick/joystick.h>
#include <Math/fg_geodesy.h> #include <Math/fg_geodesy.h>
#include <Math/mat3.h> #include <Math/mat3.h>
#include <Math/polar3d.h> #include <Math/polar3d.h>
#include <Pui/pu.h> #include <PUI/pu.h>
#include <Scenery/scenery.hxx> #include <Scenery/scenery.hxx>
#include <Scenery/tilemgr.hxx> #include <Scenery/tilemgr.hxx>
#include <Time/event.hxx> #include <Time/event.hxx>
@ -750,6 +750,9 @@ int main( int argc, char **argv ) {
// $Log$ // $Log$
// Revision 1.25 1998/06/12 14:27:26 curt
// Pui -> PUI, Gui -> GUI.
//
// Revision 1.24 1998/06/12 00:57:39 curt // Revision 1.24 1998/06/12 00:57:39 curt
// Added support for Pui/Gui. // Added support for Pui/Gui.
// Converted fog to GL_FOG_EXP2. // Converted fog to GL_FOG_EXP2.

4
Main/Makefile.am
View file

@ -27,7 +27,7 @@ fg_LDADD = \
$(top_builddir)/Simulator/Flight/libFlight.a \ $(top_builddir)/Simulator/Flight/libFlight.a \
$(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.a \ $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.a \
$(top_builddir)/Simulator/Flight/Slew/libSlew.a \ $(top_builddir)/Simulator/Flight/Slew/libSlew.a \
$(top_builddir)/Simulator/Gui/libGui.a \ $(top_builddir)/Simulator/GUI/libGUI.a \
$(top_builddir)/Simulator/Scenery/libScenery.a \ $(top_builddir)/Simulator/Scenery/libScenery.a \
$(top_builddir)/Simulator/Time/libTime.a \ $(top_builddir)/Simulator/Time/libTime.a \
$(top_builddir)/Simulator/Weather/libWeather.a \ $(top_builddir)/Simulator/Weather/libWeather.a \
@ -36,7 +36,7 @@ fg_LDADD = \
$(top_builddir)/Lib/Math/libMath.la \ $(top_builddir)/Lib/Math/libMath.la \
$(top_builddir)/Lib/Bucket/libBucket.la \ $(top_builddir)/Lib/Bucket/libBucket.la \
$(top_builddir)/Lib/Debug/libDebug.la \ $(top_builddir)/Lib/Debug/libDebug.la \
$(top_builddir)/Lib/Pui/libPui.la \ $(top_builddir)/Lib/PUI/libPUI.la \
$(top_builddir)/Lib/zlib/libz.la $(top_builddir)/Lib/zlib/libz.la
INCLUDES += \ INCLUDES += \

2
Simulator/Makefile.am
View file

@ -5,7 +5,7 @@ SUBDIRS = \
Cockpit \ Cockpit \
Controls \ Controls \
Flight \ Flight \
Gui \ GUI \
Joystick \ Joystick \
Scenery \ Scenery \
Time \ Time \