jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

very minor SDL changes

Browse source
This commit is contained in:
Steven Fuller 2001-12-28 00:48:56 +00:00 • committed by Patryk Obara
parent 053d51b61b
commit 6fc3502f4b
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -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++

4
src/cdplayer.c
View file

@ -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)

2
src/main.c
View file

@ -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>

2
src/menus.c
View file

@ -2,7 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <SDL/SDL.h>
#include "SDL.h"
#include "fixer.h"