- Linux and GCC fixes

SVN r931 (trunk)

Makefile.linux

@@ -17,7 +17,7 @@ endif
 #endif
 CFLAGS += -MMD -DHAVE_FILELENGTH -D__forceinline=inline `sdl-config --cflags` `pkg-config gtk+-2.0 --cflags`
 CFLAGS += -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNEED_STRUPR
-LDFLAGS += -lz -ljpeg -`sdl-config --libs` `pkg-config gtk+-2.0 --libs` $(FMOD_PREFIX)/lib/libfmodex.so
+LDFLAGS += -lz -ljpeg `sdl-config --libs` `pkg-config gtk+-2.0 --libs` $(FMOD_PREFIX)/lib/libfmodex.so
 NASMFLAGS += -f elf -DM_TARGET_LINUX
 
 SRCDIRS = src/ $(addprefix src/,g_doom/ g_heretic/ g_hexen/ g_raven/ g_shared/ g_strife/ oplsynth/ sound/ sdl/ textures/ thingdef/ xlat/ timidity/)

src/c_console.cpp

@@ -845,13 +845,16 @@ int PrintString (int printlevel, const char *outline)
 //#endif
 	}
 
-	I_PrintStr (outline);
+	if (printlevel != PRINT_LOG)
-
-	AddToConsole (printlevel, outline);
-	if (vidactive && screen && screen->Font)
 	{
-		C_AddNotifyString (printlevel, outline);
+		I_PrintStr (outline);
-		maybedrawnow (false, false);
+
+		AddToConsole (printlevel, outline);
+		if (vidactive && screen && screen->Font)
+		{
+			C_AddNotifyString (printlevel, outline);
+			maybedrawnow (false, false);
+		}
 	}
 	return (int)strlen (outline);
 }

src/doomtype.h

@@ -183,6 +183,7 @@ enum
 #define PRINT_HIGH				2				// critical messages
 #define PRINT_CHAT				3				// chat messages
 #define PRINT_TEAMCHAT			4				// chat messages from a teammate
+#define PRINT_LOG				5				// only to logfile
 #define PRINT_BOLD				200				// What Printf_Bold used
 
 struct PalEntry

src/sound/music_timidity_mididevice.cpp

@@ -41,6 +41,7 @@
 #include "w_wad.h"
 #include "v_text.h"
 #include "timidity/timidity.h"
+#include <errno.h>
 
 // MACROS ------------------------------------------------------------------
 

src/textures/bitmap.h

@@ -68,7 +68,7 @@ public:
 		FreeBuffer = false;
 	}
 
-	~FBitmap()
+	virtual ~FBitmap()
 	{
 		Destroy();
 	}