diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-12-28 00:48:56 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:37 +0200 |
| commit | 6fc3502f4b14932dc607c6bafcdc2d0ada30ba94 (patch) | |
| tree | d62eb7c93547fe73c636a1f7c8231f77158668d3 | |
| parent | 053d51b61b08b8b02049f61094d30d5c83f43016 (diff) | |
very minor SDL changes
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | src/cdplayer.c | 4 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/menus.c | 2 |
4 files changed, 8 insertions, 7 deletions
@@ -9,11 +9,12 @@ CFLAGS = -g -Wall -pipe -O2 -Dengine=1 -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 - #CFLAGS = -Wall -pipe -O6 -ffast-math -fomit-frame-pointer -march=pentiumpro -mcpu=pentiumpro -Dengine=1 -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets CXXFLAGS = $(CFLAGS) -CFLAGS += `sdl-config --cflags` -LDLIBS = -L/usr/X11R6/lib -lX11 -lXext -lGL `sdl-config --libs` -lopenal +CFLAGS += $(shell sdl-config --cflags) +#LDLIBS = -L/usr/X11R6/lib -lX11 -lXext -lGL $(shell sdl-config --libs) -lopenal +LDLIBS = $(shell sdl-config --libs) -lGL -lopenal # Debian SDL+NVIDIA workaround (change /usr/lib to the real location of the files) -#LDLIBS = -L/usr/X11R6/lib -lX11 -lXext /usr/lib/libGL.so.1 `sdl-config --libs` -lopenal -lm +#LDLIBS = -L/usr/X11R6/lib -lX11 -lXext /usr/lib/libGL.so.1 $(shell sdl-config --libs) -lopenal -lm # required for gcc-3.0 #LDLIBS += -lstdc++ diff --git a/src/cdplayer.c b/src/cdplayer.c index 53fcb7c..b8bf9ec 100644 --- a/src/cdplayer.c +++ b/src/cdplayer.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <string.h> -#include <SDL/SDL.h> +#include "SDL.h" #include "fixer.h" #include "win95/cd_player.h" @@ -35,7 +35,7 @@ void CDDA_Start() if (!HaveCDROM) { HaveCDROM = 1; - SDL_Init(SDL_INIT_CDROM); + SDL_InitSubSystem(SDL_INIT_CDROM); } if (cdrom != NULL) @@ -3,7 +3,7 @@ #include <string.h> #include <ctype.h> -#include <SDL/SDL.h> +#include "SDL.h" #include <GL/gl.h> #include <GL/glext.h> diff --git a/src/menus.c b/src/menus.c index 47b6d30..f31014a 100644 --- a/src/menus.c +++ b/src/menus.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <string.h> -#include <SDL/SDL.h> +#include "SDL.h" #include "fixer.h" |