maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes to fix compile errors in linux.

Browse Source 
~Tom
This commit is contained in:
Tom Hicks
2006-09-14 16:34:57 -04:00
parent 6c807cd104
commit 8b6053141d
3 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -8,7 +8,7 @@ Darwin)
USE_AGL=1
;;
Linux)
ln -sf Makefile.linux makefile
ln -sf Makefile.linux Makefile
ln -sf Makefile.linux src/Makefile
#this should be set as a default if no option is specified and set via options otherwise

45
src/Makefile.linux
View File

@@ -2,7 +2,7 @@
CPP = g++ -g
INCLUDES = -I/usr/X11R6/include
LD = g++
OBJECTS = screen.o bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o physics.o player.o strmanip.o tga.o vector.o window.o keys.o main.o
OBJECTS = screen.o bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o player.o strmanip.o tga.o vector.o window.o keys.o main.o
LIBS = -L/usr/X11R6/lib -lGL -lGLU -lXxf86vm
LIBRARIES =
SO_LIBS =
@@ -12,17 +12,17 @@ LDFLAGS = $(LIBS)
.Phony: all clean install
all: ../OpenArena/OA
all: ../OpenArena
clean:
rm -f *.o
rm -f ../OpenArena/OA
rm -f ../OpenArena
install:
#Executables
../OpenArena/OA: $(OBJECTS)
$(LD) $(LDFLAGS) -o ../OpenArena/OA $(OBJECTS)
../OpenArena: $(OBJECTS)
$(LD) $(LDFLAGS) -o ../OpenArena $(OBJECTS)
#Dynamic Libraries
oa_game.so:
@@ -37,49 +37,46 @@ oa_input.so:
#Object Files
screen.o: screen.cpp screen.h config.h
$(CPP) $(CPPFLAGS)-c -o screen.o screen.cpp
$(CPP) $(CPPFLAGS) -c -o screen.o screen.cpp
bmp.o: bmp.cpp bmp.h mygl.h datatypes.h texture.h config.h
$(CPP) $(CPPFLAGS)-c -o bmp.o bmp.cpp
$(CPP) $(CPPFLAGS) -c -o bmp.o bmp.cpp
camera.o: camera.cpp camera.h vector.h mygl.h screen.h config.h
$(CPP) $(CPPFLAGS)-c -o camera.o camera.cpp
$(CPP) $(CPPFLAGS) -c -o camera.o camera.cpp
ctrls.o: ctrls.cpp ctrls.h keys.h physics.h datatypes.h list.h config.h
$(CPP) $(CPPFLAGS)-c -o ctrls.o ctrls.cpp
ctrls.o: ctrls.cpp ctrls.h keys.h datatypes.h list.h config.h
$(CPP) $(CPPFLAGS) -c -o ctrls.o ctrls.cpp
level.o: level.cpp level.h version.h config.h
$(CPP) $(CPPFLAGS)-c -o level.o level.cpp
$(CPP) $(CPPFLAGS) -c -o level.o level.cpp
mygl.o: mygl.cpp mygl.h config.h
$(CPP) $(CPPFLAGS)-c -o mygl.o mygl.cpp
$(CPP) $(CPPFLAGS) -c -o mygl.o mygl.cpp
myglFont.o: myglFont.cpp myglFont.h config.h
$(CPP) $(CPPFLAGS)-c -o myglFont.o myglFont.cpp
$(CPP) $(CPPFLAGS) -c -o myglFont.o myglFont.cpp
myglTexture.o: myglTexture.cpp myglTexture.h config.h
$(CPP) $(CPPFLAGS)-c -o myglTexture.o myglTexture.cpp
physics.o: physics.cpp physics.h config.h
$(CPP) $(CPPFLAGS)-c -o physics.o physics.cpp
$(CPP) $(CPPFLAGS) -c -o myglTexture.o myglTexture.cpp
player.o: player.cpp player.h config.h
$(CPP) $(CPPFLAGS)-c -o player.o player.cpp
$(CPP) $(CPPFLAGS) -c -o player.o player.cpp
strmanip.o: strmanip.cpp strmanip.h config.h
$(CPP) $(CPPFLAGS)-c -o strmanip.o strmanip.cpp
$(CPP) $(CPPFLAGS) -c -o strmanip.o strmanip.cpp
tga.o: tga.cpp tga.h config.h
$(CPP) $(CPPFLAGS)-c -o tga.o tga.cpp
$(CPP) $(CPPFLAGS) -c -o tga.o tga.cpp
vector.o: vector.cpp vector.h config.h
$(CPP) $(CPPFLAGS)-c -o vector.o vector.cpp
$(CPP) $(CPPFLAGS) -c -o vector.o vector.cpp
window.o: window.cpp window.h config.h
$(CPP) $(CPPFLAGS)-c -o window.o window.cpp
$(CPP) $(CPPFLAGS) -c -o window.o window.cpp
keys.o: keys.cpp keys.h config.h
$(CPP) $(CPPFLAGS)-c -o keys.o keys.cpp
$(CPP) $(CPPFLAGS) -c -o keys.o keys.cpp
main.o: linux.cpp main.h config.h
$(CPP) $(CPPFLAGS)-c -o main.o linux.cpp
$(CPP) $(CPPFLAGS) -c -o main.o linux.cpp

6
src/linux.cpp
View File

@@ -128,15 +128,15 @@ int main(int argc, char** argv)
level.screen.SetColorDepth(24);
}
g_Screen.SetOnInit(InitGL);
g_Screen.SetOnResize(ResizeGLScene);
// g_Screen.SetOnInit(InitGL);
// g_Screen.SetOnResize(ResizeGLScene);
if(!g_Screen.Open(OPENARENA_VERSION, level.screen.GetWidth(), level.screen.GetHeight(), level.screen.GetColorDepth(), level.screen.GetFullscreen()))
{
return 1;
}
level.SetWindow(g_Screen);
level.SetWindow(&g_Screen);
if(level.nextLevel == "")
{