diff --git a/Makefile.linux b/Makefile.linux index 9c62fad8a..884a5467c 100644 --- a/Makefile.linux +++ b/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/) diff --git a/src/c_console.cpp b/src/c_console.cpp index 7b0a9d5ee..30a68dc1f 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -845,13 +845,16 @@ int PrintString (int printlevel, const char *outline) //#endif } - I_PrintStr (outline); - - AddToConsole (printlevel, outline); - if (vidactive && screen && screen->Font) + if (printlevel != PRINT_LOG) { - C_AddNotifyString (printlevel, outline); - maybedrawnow (false, false); + I_PrintStr (outline); + + AddToConsole (printlevel, outline); + if (vidactive && screen && screen->Font) + { + C_AddNotifyString (printlevel, outline); + maybedrawnow (false, false); + } } return (int)strlen (outline); } diff --git a/src/doomtype.h b/src/doomtype.h index 6b2946af4..c3b9d8f39 100644 --- a/src/doomtype.h +++ b/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 diff --git a/src/sound/music_timidity_mididevice.cpp b/src/sound/music_timidity_mididevice.cpp index e86e9140c..dce118663 100644 --- a/src/sound/music_timidity_mididevice.cpp +++ b/src/sound/music_timidity_mididevice.cpp @@ -41,6 +41,7 @@ #include "w_wad.h" #include "v_text.h" #include "timidity/timidity.h" +#include // MACROS ------------------------------------------------------------------ diff --git a/src/textures/bitmap.h b/src/textures/bitmap.h index 6fd2ed6b0..a63182032 100644 --- a/src/textures/bitmap.h +++ b/src/textures/bitmap.h @@ -68,7 +68,7 @@ public: FreeBuffer = false; } - ~FBitmap() + virtual ~FBitmap() { Destroy(); }