SDL1 compile fix

aviplay.c

@@ -165,7 +165,6 @@ PAL_ParseAVInfoList(
 {
     AVIChunk         hdr;
     DWORD            dwNextOffset;
-    MainAVIHeader    aviHeader;
     AVIStreamHeader  streamHdr;
     BitmapInfoHeader bitmapHdr;
     WaveFormat       waveFormat;
@@ -208,7 +207,7 @@ PAL_ParseAVInfoList(
         default:
             break;
         }
-        
+
         fseek(lpAVIPlayState->fp, dwNextOffset, SEEK_SET);
     }
 
@@ -230,7 +229,7 @@ PAL_ParseHdrlList(
         {
             return; // end of file reached
         }
-        
+
         fread(&hdr, sizeof(DWORD) * 2, 1, lpAVIPlayState->fp);
         hdr.dwFourCC = SDL_SwapLE32(hdr.dwFourCC);
         hdr.dwSize = SDL_SwapLE32(hdr.dwSize);

unix/Makefile

@@ -1,69 +1,70 @@
-# General makefile for generic unix & linux platforms
-
-TARGET = sdlpal
-TEST_TARGET = ./sdlpal-tests
-
-HOST =
-TEST_CCFLAGS =
-
-GENERATED = -DPAL_HAS_GIT_REVISION $(shell ../scripts/gengitrev)
-
-DEPFLAGS = -MT $@ -MMD -MP -MF $*.Td
-
-GTEST_DIR = ../3rd/googletest/googletest
-
-CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) 
-CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
-OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
-DEPFILES = $(OBJFILES:.o=.d) 
-TEST_CPPFILES = $(wildcard ../tests/*.cpp)
-TEST_OBJFILES = $(TEST_CPPFILES:.cpp=.o)
-
-CCFLAGS = `sdl2-config --cflags` -g -Wall -O2 -fno-strict-aliasing -I. -I../ -I../liboggvorbis/include -I../liboggvorbis/src -DPAL_HAS_PLATFORM_SPECIFIC_UTILS $(TEST_CCFLAGS) $(GENERATED)
-CXXFLAGS = $(CCFLAGS) -std=c++11 `fltk-config --cxxflags`
-CFLAGS = $(CCFLAGS) -std=gnu99 `fltk-config --cflags`
-LDFLAGS = `sdl2-config --libs` `fltk-config --ldflags` -lstdc++ -lm -pthread
-TEST_CXXFLAGS += -isystem $(GTEST_DIR)/include -I $(GTEST_DIR) -g -Wall -Wextra -pthread
-
-POSTCOMPILE = @mv -f $*.Td $*.d && touch $@
-
-.PHONY : all clean check
-
-all: $(TARGET)
-
-$(TARGET): $(OBJFILES)
-	@echo [LD] $@
-	@$(HOST)gcc $^ -o $@ $(LDFLAGS)
-
-gtest-all.o : $(GTEST_DIR)/src/gtest-all.cc %.d
-	@echo [CC] $<
-	@$(HOST)g++ $(DEPFLAGS) $(TEST_CXXFLAGS) -c $< -o $@
-	$(POSTCOMPILE)
-
-%.o: %.c %.d
-	@echo [CC] $<
-	@$(HOST)gcc $(DEPFLAGS) $(CFLAGS) -c $< -o $@
-	$(POSTCOMPILE)
-
-%.o: %.cpp %.d
-	@echo [CC] $<
-	@$(HOST)g++ $(DEPFLAGS) $(CXXFLAGS) -c $< -o $@
-	$(POSTCOMPILE)
-
-$(TEST_TARGET): $(OBJFILES) $(TEST_OBJFILES) gtest-all.o
-	@echo [LD] $@
-	@$(HOST)g++ $^ -o $@ $(LDFLAGS) -lpthread
-
-clean:
-	-rm -f $(TARGET) $(TEST_TARGET) $(OBJFILES) $(TEST_OBJFILES) $(DEPFILES)
-
-%.d: ;
-.PRECIOUS: %.d
-
--include $(DEPFILES)
-
-check: TEST_CCFLAGS = -DUNIT_TEST=1 -isystem $(GTEST_DIR)/include
-check: $(TEST_TARGET)
-	@echo [EXEC] $(TEST_TARGET)
-	@chmod +x $(TEST_TARGET)
-	@exec $(TEST_TARGET)
+# General makefile for generic unix & linux platforms
+
+TARGET = sdlpal
+TEST_TARGET = ./sdlpal-tests
+
+HOST =
+TEST_CCFLAGS =
+
+GENERATED = -DPAL_HAS_GIT_REVISION $(shell ../scripts/gengitrev)
+
+DEPFLAGS = -MT $@ -MMD -MP -MF $*.Td
+
+GTEST_DIR = ../3rd/googletest/googletest
+
+CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) 
+CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
+OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o)
+DEPFILES = $(OBJFILES:.o=.d) 
+TEST_CPPFILES = $(wildcard ../tests/*.cpp)
+TEST_OBJFILES = $(TEST_CPPFILES:.cpp=.o)
+SDL_CONFIG = sdl2-config
+
+CCFLAGS = `$(SDL_CONFIG) --cflags` -g -Wall -O2 -fno-strict-aliasing -I. -I../ -I../liboggvorbis/include -I../liboggvorbis/src -DPAL_HAS_PLATFORM_SPECIFIC_UTILS $(TEST_CCFLAGS) $(GENERATED)
+CXXFLAGS = $(CCFLAGS) -std=c++11 `fltk-config --cxxflags`
+CFLAGS = $(CCFLAGS) -std=gnu99 `fltk-config --cflags`
+LDFLAGS = `$(SDL_CONFIG) --libs` `fltk-config --ldflags` -lstdc++ -lm -pthread
+TEST_CXXFLAGS += -isystem $(GTEST_DIR)/include -I $(GTEST_DIR) -g -Wall -Wextra -pthread
+
+POSTCOMPILE = @mv -f $*.Td $*.d && touch $@
+
+.PHONY : all clean check
+
+all: $(TARGET)
+
+$(TARGET): $(OBJFILES)
+	@echo [LD] $@
+	@$(HOST)gcc $^ -o $@ $(LDFLAGS)
+
+gtest-all.o : $(GTEST_DIR)/src/gtest-all.cc %.d
+	@echo [CC] $<
+	@$(HOST)g++ $(DEPFLAGS) $(TEST_CXXFLAGS) -c $< -o $@
+	$(POSTCOMPILE)
+
+%.o: %.c %.d
+	@echo [CC] $<
+	@$(HOST)gcc $(DEPFLAGS) $(CFLAGS) -c $< -o $@
+	$(POSTCOMPILE)
+
+%.o: %.cpp %.d
+	@echo [CC] $<
+	@$(HOST)g++ $(DEPFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(POSTCOMPILE)
+
+$(TEST_TARGET): $(OBJFILES) $(TEST_OBJFILES) gtest-all.o
+	@echo [LD] $@
+	@$(HOST)g++ $^ -o $@ $(LDFLAGS) -lpthread
+
+clean:
+	-rm -f $(TARGET) $(TEST_TARGET) $(OBJFILES) $(TEST_OBJFILES) $(DEPFILES)
+
+%.d: ;
+.PRECIOUS: %.d
+
+-include $(DEPFILES)
+
+check: TEST_CCFLAGS = -DUNIT_TEST=1 -isystem $(GTEST_DIR)/include
+check: $(TEST_TARGET)
+	@echo [EXEC] $(TEST_TARGET)
+	@chmod +x $(TEST_TARGET)
+	@exec $(TEST_TARGET)

util.c

@@ -32,7 +32,9 @@
 #include "SDL_messagebox.h"
 #endif
 
-void UTIL_MsgBox(char *string){
+void UTIL_MsgBox(char *string)
+{
+#if SDL_VERSION_ATLEAST(2, 0, 0)
     extern SDL_Window *gpWindow;
     char buffer[300];
     SDL_MessageBoxButtonData buttons[] = { { 0, 0, "OK" } };
@@ -40,6 +42,7 @@ void UTIL_MsgBox(char *string){
     int btnid;
     sprintf(buffer, "%s\n", string);
     SDL_ShowMessageBox(&mbd, &btnid);
+#endif
 }
 
 long

video.c

@@ -1066,7 +1066,7 @@ VIDEO_SetWindowTitle(
 
   Parameters:
 
-    [IN]  lpszTitle - the new caption of the window.
+    [IN]  pszTitle - the new caption of the window.
 
   Return value:
 
@@ -1077,7 +1077,7 @@ VIDEO_SetWindowTitle(
 #if SDL_VERSION_ATLEAST(2,0,0)
 	SDL_SetWindowTitle(gpWindow, pszTitle);
 #else
-	SDL_WM_SetCaption(lpszCaption, NULL);
+	SDL_WM_SetCaption(pszTitle, NULL);
 #endif
 }
 
@@ -1229,6 +1229,7 @@ VIDEO_DrawSurfaceToScreen(
    // Draw the surface to screen.
    //
    SDL_SoftStretch(pCompatSurface, NULL, gpScreenReal, NULL);
+
    SDL_UpdateRect(gpScreenReal, 0, 0, gpScreenReal->w, gpScreenReal->h);
    SDL_FreeSurface(pCompatSurface);
 #endif