Put #includes back the way they were, and fix compile problems under win

macros/Makefile

@@ -63,33 +63,33 @@ CC = gcc
 CPP = gcc -E
 CXX = g++
 CXXCPP = g++ -E
-GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib
-GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib
+GNOMEGNORBA_LIBS = 
+GNOMEUI_LIBS = 
 GNOME_APPLETS_LIBS = 
 GNOME_CAPPLET_LIBS = 
-GNOME_CONFIG = /opt/gnome/bin/gnome-config
+GNOME_CONFIG = 
 GNOME_DOCKLETS_LIBS = 
-GNOME_INCLUDEDIR = -I/opt/gnome/include -DNEED_GNOMESUPPORT_H -I/opt/gnome/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include -I/usr/include/gtk-1.2 -I/usr/X11R6/include
-GNOME_LIBDIR = -rdynamic -L/opt/gnome/lib -L/usr/lib -L/usr/X11R6/lib
-GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib
-GNORBA_CFLAGS = -I/opt/gnome/include -DNEED_GNOMESUPPORT_H -I/opt/gnome/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include -I/usr/include/gtk-1.2 -I/usr/X11R6/include
-GNORBA_LIBS = -rdynamic -L/opt/gnome/lib -L/usr/lib -L/usr/X11R6/lib -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib
-GTKXMHTML_LIBS = -rdynamic -lgtkxmhtml -lXpm -ljpeg -lpng -lz -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
+GNOME_INCLUDEDIR = 
+GNOME_LIBDIR = 
+GNOME_LIBS = 
+GNORBA_CFLAGS = 
+GNORBA_LIBS = 
+GTKXMHTML_LIBS = 
 GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
 GTK_CONFIG = /usr/bin/gtk-config
-GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
+GTK_LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
 MAKEINFO = makeinfo
-ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include
-ORBIT_CONFIG = /usr/bin/orbit-config
-ORBIT_IDL = /usr/bin/orbit-idl
-ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm
+ORBIT_CFLAGS = 
+ORBIT_CONFIG = 
+ORBIT_IDL = 
+ORBIT_LIBS = 
 PACKAGE = celestia
-PTHREAD_LIB = -lpthread
+PTHREAD_LIB = 
 RANLIB = ranlib
 VERSION = 1.1.5
-XPM_LIBS = -lXpm
-ZVT_LIBS = -rdynamic -lzvt -lutil -lSM -lICE -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
-cflags_set = yes
+XPM_LIBS = 
+ZVT_LIBS = 
+cflags_set = 
 cxxflags_set = @cxxflags_set@
 
 MACROS =    aclocal-include.m4				  compiler-flags.m4				  curses.m4					  gnome-bonobo-check.m4				  gnome-fileutils.m4				  gnome-ghttp-check.m4				  gnome-gnorba-check.m4				  gnome-guile-checks.m4				  gnome-libgtop-check.m4			  gnome-objc-checks.m4				  gnome-orbit-check.m4				  gnome-print-check.m4				  gnome-pthread-check.m4			  gnome-support.m4				  gnome-undelfs.m4				  gnome-vfs.m4					  gnome-x-checks.m4				  gnome-xml-check.m4				  gnome.m4					  gperf-check.m4				  linger.m4					  need-declaration.m4

src/celengine/asterism.cpp

@@ -8,9 +8,13 @@
 // of the License, or (at your option) any later version.
 
 #include <algorithm>
-#include "config.h"
-#include "celutil/util.h"
-#include "celutil/debug.h"
+
+#ifndef _WIN32
+#include <config.h>
+#endif /* _WIN32 */
+
+#include <celutil/util.h>
+#include <celutil/debug.h>
 #include "parser.h"
 #include "asterism.h"
 

src/celengine/celestia.h

@@ -26,8 +26,8 @@
 #endif // __GNUC__
 
 #ifndef _WIN32
-#include "config.h"
-#endif
+#include <config.h>
+#endif /* _WIN32 */
 
 #endif // _CELESTIA_H_
 

src/celengine/cmdparser.cpp

@@ -20,9 +20,9 @@
 #include <strstream>
 #endif // HAVE_SSTREAM
 
-#include "celutil/util.h"
-#include "celutil/debug.h"
-#include "celmath/mathlib.h"
+#include <celutil/util.h>
+#include <celutil/debug.h>
+#include <celmath/mathlib.h>
 #include "astro.h"
 #include "cmdparser.h"
 

src/celengine/galaxy.cpp

@@ -10,13 +10,13 @@
 #include <algorithm>
 #include <stdio.h>
 #include "celestia.h"
-#include "celmath/mathlib.h"
-#include "celmath/perlin.h"
+#include <celmath/mathlib.h>
+#include <celmath/perlin.h>
 #include "astro.h"
 #include "galaxy.h"
 #include "parser.h"
-#include "celutil/util.h"
-#include "celutil/debug.h"
+#include <celutil/util.h>
+#include <celutil/debug.h>
 
 using namespace std;
 

src/celengine/meshmanager.cpp

@@ -11,11 +11,11 @@
 #include <fstream>
 
 #include "celestia.h"
-#include "celutil/debug.h"
-#include "celutil/filetype.h"
-#include "celmath/mathlib.h"
-#include "celmath/perlin.h"
-#include "cel3ds/3dsread.h"
+#include <celutil/debug.h>
+#include <celutil/filetype.h>
+#include <celmath/mathlib.h>
+#include <celmath/perlin.h>
+#include <cel3ds/3dsread.h>
 
 #include "3dsmesh.h"
 #include "parser.h"

src/celengine/render.cpp

@@ -10,12 +10,14 @@
 #include <algorithm>
 #include <cstdio>
 #include <cstring>
+
 #ifndef _WIN32
-#include "config.h"
-#endif
-#include "celutil/debug.h"
-#include "celmath/frustum.h"
-#include "celmath/perlin.h"
+#include <config.h>
+#endif /* _WIN32 */
+
+#include <celutil/debug.h>
+#include <celmath/frustum.h>
+#include <celmath/perlin.h>
 #include "gl.h"
 #include "astro.h"
 #include "glext.h"

src/celengine/solarsys.cpp

@@ -8,11 +8,13 @@
 // of the License, or (at your option) any later version.
 
 #include <cassert>
+
 #ifndef _WIN32
-#include "config.h"
-#endif
-#include "celutil/debug.h"
-#include "celmath/mathlib.h"
+#include <config.h>
+#endif /* _WIN32 */
+
+#include <celutil/debug.h>
+#include <celmath/mathlib.h>
 #include "astro.h"
 #include "parser.h"
 #include "customorbit.h"

src/celengine/texmanager.cpp

@@ -8,7 +8,7 @@
 // of the License, or (at your option) any later version.
 
 #include "celestia.h"
-#include "celutil/debug.h"
+#include <celutil/debug.h>
 #include "texmanager.h"
 
 using namespace std;

src/celengine/texture.cpp

@@ -17,12 +17,12 @@
 #include <cstdio>
 
 #ifndef _WIN32
-#include "config.h"
-#endif
+#include <config.h>
+#endif /* _WIN32 */
 
-#include "celmath/vecmath.h"
-#include "celutil/filetype.h"
-#include "celutil/debug.h"
+#include <celmath/vecmath.h>
+#include <celutil/filetype.h>
+#include <celutil/debug.h>
 
 #include "gl.h"
 #include "glext.h"

src/celestia/celestiacore.cpp

@@ -20,18 +20,18 @@
 #include <cstdlib>
 #include <cctype>
 #include <cstring>
-#include "celengine/gl.h"
-#include "celmath/vecmath.h"
-#include "celmath/quaternion.h"
-#include "celmath/mathlib.h"
-#include "celutil/util.h"
-#include "celengine/stardb.h"
-#include "celengine/solarsys.h"
-#include "celengine/asterism.h"
-#include "celengine/astro.h"
-#include "celengine/overlay.h"
-#include "celengine/execution.h"
-#include "celengine/cmdparser.h"
+#include <celengine/gl.h>
+#include <celmath/vecmath.h>
+#include <celmath/quaternion.h>
+#include <celmath/mathlib.h>
+#include <celutil/util.h>
+#include <celengine/stardb.h>
+#include <celengine/solarsys.h>
+#include <celengine/asterism.h>
+#include <celengine/astro.h>
+#include <celengine/overlay.h>
+#include <celengine/execution.h>
+#include <celengine/cmdparser.h>
 #include "favorites.h"
 #include "celestiacore.h"
 

src/celestia/glutmain.cpp

@@ -17,14 +17,14 @@
 #include <cstring>
 #include <time.h>
 #include <unistd.h>
-#include "celengine/gl.h"
+#include <celengine/gl.h>
 #include <GL/glut.h>
-#include "celengine/celestia.h"
-#include "celmath/vecmath.h"
-#include "celmath/quaternion.h"
-#include "celutil/util.h"
-#include "celmath/mathlib.h"
-#include "celengine/astro.h"
+#include <celengine/celestia.h>
+#include <celmath/vecmath.h>
+#include <celmath/quaternion.h>
+#include <celutil/util.h>
+#include <celmath/mathlib.h>
+#include <celengine/astro.h>
 #include "celestiacore.h"
 
 

src/celestia/gtkmain.cpp

@@ -17,8 +17,8 @@
 #include <cstring>
 #include <time.h>
 #include <unistd.h>
-#include "celengine/gl.h"
-#include "celengine/celestia.h"
+#include <celengine/gl.h>
+#include <celengine/celestia.h>
 
 #ifndef DEBUG
 #  define G_DISABLE_ASSERT

src/celtxf/texturefont.cpp

@@ -12,12 +12,12 @@
 #include <fstream>
 
 #ifndef _WIN32
-#include "config.h"
-#endif
+#include <config.h>
+#endif /* _WIN32 */
 
-#include "celutil/debug.h"
-#include "celutil/bytes.h"
-#include "celengine/gl.h"
+#include <celutil/debug.h>
+#include <celutil/bytes.h>
+#include <celengine/gl.h>
 #include "texturefont.h"
 
 using namespace std;

src/celutil/bytes.h

@@ -13,7 +13,7 @@
 #if 0
 #ifndef _WIN32
 #include "../config.h"
-#endif
+#endif /* _WIN32 */
 #endif
 
 /* Use the system byteswap.h definitions if we have them */

src/celutil/debug.cpp

@@ -12,9 +12,10 @@
 #endif
 #include <stdio.h>
 #include <cstdarg>
+
 #ifndef _WIN32
-#include "config.h"
-#endif
+#include <config.h>
+#endif /* _WIN32 */
 
 #if defined(DEBUG) || defined(_DEBUG)
 void DebugPrint(char *format, ...)