MSVC tweaks.

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index d07f1e867437b805901255f1e018928541e6ebc7..1e05ae43d35b04926c26c1e84bd4dfe911713e97 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -35,9 +35,9 @@ EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
 
-noinst_SCRIPTS = runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat runfgfs
 
-bin_SCRIPTS = runfgfs
+# bin_SCRIPTS = runfgfs
 
 fgfs_SOURCES = \
        main.cxx \

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index a840e65bd8026abbed1a615018c16e14a370dba6..0ef9568f1c4bfae733583347cb58e317ec85c83d 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -25,6 +25,8 @@
 #  include <config.h>
 #endif
 
+#include <simgear/compiler.h>
+
 #ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif

diff --git a/src/Scenery/FGTileLoader.hxx b/src/Scenery/FGTileLoader.hxx
index 78334b5eaaeaed552bcc3b77a9c0f8c0bef55d7a..74d237f34e8ce321916a5198faf9bb749b3bbab6 100644 (file)
--- a/src/Scenery/FGTileLoader.hxx
+++ b/src/Scenery/FGTileLoader.hxx
@@ -32,8 +32,10 @@
 #  include <simgear/threads/SGQueue.hxx>
 #else
 #  include <queue>
+   SG_USING_STD( queue );
 #endif
 
+
 // Forward reference.
 class FGTileEntry;
 

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index fe9c6fd2f0a66d747931fc016106a0ba034983b2..067fb563f6141e202643dbfdff2153b696fbcad0 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -50,6 +50,8 @@
 #  define FG_MEM_COPY(to,from,n)        bcopy(from, to, n)
 #endif
 
+SG_USING_STD( queue );
+
 
 // forward declaration
 class FGTileEntry;