empty I_InitTimidityConfig() decleration for non timidity ports!

diff --git a/doomgeneric/dummy.c b/doomgeneric/dummy.c
index 693901ca696ec7caed6493a2601ede035cd9da35..d78816b8c11c255b41af4773e666debc58ec792c 100644 (file)
--- a/doomgeneric/dummy.c
+++ b/doomgeneric/dummy.c
@@ -40,6 +40,14 @@ boolean drone = false;
  *  public functions                                                   *
  *---------------------------------------------------------------------*/
 
+#ifndef FEATURE_SOUND
+
+void I_InitTimidityConfig(void)
+{
+}
+
+#endif
+
 /*---------------------------------------------------------------------*
  *  eof                                                                *
  *---------------------------------------------------------------------*/

diff --git a/doomgeneric/i_timer.c b/doomgeneric/i_timer.c
index 27beaaf1dbbce8f184bb61d43d084524f56bab56..0a85c722b58eb1ece8dbb3d83c2590cffbe328e1 100644 (file)
--- a/doomgeneric/i_timer.c
+++ b/doomgeneric/i_timer.c
@@ -22,8 +22,7 @@
 #include "doomgeneric.h"
 
 #include <stdarg.h>
-#include <stdio.h>
-#include <SDL2/SDL.h>
+
 //#include <sys/time.h>
 //#include <unistd.h>
 
@@ -92,12 +91,6 @@ void I_InitTimer(void)
 {
     // initialize timer
 
-    printf("I_InitTimer: Setting up timer.\n");
-    if (SDL_Init(SDL_INIT_TIMER) < 0)
-    {
-        printf("SDL_Init failed: %s\n", SDL_GetError());
-        atexit(SDL_Quit);
-        exit(1);
-    }
+    //SDL_Init(SDL_INIT_TIMER);
 }
 

diff --git a/doomgeneric/i_video.h b/doomgeneric/i_video.h
index 3c7db198dc0732a01b7f161a8d13ae1973cd959b..85d1fea419f43f50016b64bafd9fb046e4cfd789 100644 (file)
--- a/doomgeneric/i_video.h
+++ b/doomgeneric/i_video.h
@@ -136,6 +136,8 @@ void I_StartTic (void);
 
 void I_EnableLoadingDisk(void);
 
+void I_EndRead (void);
+
 extern char *video_driver;
 extern boolean screenvisible;