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

Changed: Made the makefiles a bit more proper

Browse Source 
~g2k
This commit is contained in:
Tom Hicks
2005-07-02 22:27:07 -04:00
parent c46626a7a8
commit 4a7acb6812
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@@ -1,11 +1,22 @@
EXECUTABLES = OpenArena/OA
LIBRARIES =
BUILDROOT = /usr/local
PREFIX =
.Phony: all clean install .Phony: all clean install
all: all:
$(MAKE) -C src all
clean: clean:
$(MAKE) -C src clean
install: install:
install-devel:
install-doc:

25
src/Makefile
View File

@@ -1,8 +1,9 @@
#Dependencies soooo need to be fixed/finished
CPP = g++ -g CPP = g++ -g
INCLUDES = INCLUDES =
LD = g++ LD = g++
INCLUDEPATH = ../include INCLUDEPATH = ../include
OBJECTS = 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 main.o OBJECTS = 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
LIBS = -L/usr/X11R6/lib -lGL -lGLU -lXxf86vm LIBS = -L/usr/X11R6/lib -lGL -lGLU -lXxf86vm
LIBRARIES = LIBRARIES =
SO_LIBS = SO_LIBS =
@@ -12,7 +13,7 @@ LDFLAGS = $(LIBS)
.Phony: all clean install .Phony: all clean install
all: ../OpenArena/OA all: ../OpenArena/OA
clean: clean:
rm -f *.o rm -f *.o
@@ -33,24 +34,13 @@ oa_video.so:
oa_input.so: oa_input.so:
#Add something like this bmp.o: bmp.cpp $(INCLUDEPATH)/bmp.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/datatypes.h $(INCLUDEPATH)/texture.h
#$(INCLUDEPATH)/bmp.h: mygl.h datatypes.h texture.h
# touch bmp.h
bmp.o: bmp.cpp $(INCLUDEPATH)/bmp.h
$(CPP) -c -o bmp.o bmp.cpp $(CPP) -c -o bmp.o bmp.cpp
$(INCLUDEPATH)/bmp.h: $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/datatypes.h $(INCLUDEPATH)/texture.h camera.o: camera.cpp $(INCLUDEPATH)/camera.h $(INCLUDEPATH)/vector.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/screen.h
touch $(INCLUDEPATH)/bmp.h
#$(INCLUDEPATH)/mygl.h: $(INCLUDEPATH)/datatypes.h
camera.o: camera.cpp $(INCLUDEPATH)/camera.h
$(CPP) -c -o camera.o camera.cpp $(CPP) -c -o camera.o camera.cpp
#$(INCLUDEPATH)/camera.h ctrls.o: ctrls.cpp $(INCLUDEPATH)/ctrls.h
ctrls.o: ctrls.cpp $(INCLUDEPATH)/ctrls.h
$(CPP) -c -o ctrls.o ctrls.cpp $(CPP) -c -o ctrls.o ctrls.cpp
level.o: level.cpp $(INCLUDEPATH)/level.h level.o: level.cpp $(INCLUDEPATH)/level.h
@@ -85,6 +75,9 @@ vector.o: vector.cpp $(INCLUDEPATH)/vector.h
window.o: window.cpp $(INCLUDEPATH)/window.h window.o: window.cpp $(INCLUDEPATH)/window.h
$(CPP) -c -o window.o window.cpp $(CPP) -c -o window.o window.cpp
keys.o: keys.cpp $(INCLUDEPATH)/keys.h
$(CPP) -c -o keys.o keys.cpp
main.o: linux.cpp $(INCLUDEPATH)/main.h main.o: linux.cpp $(INCLUDEPATH)/main.h
$(CPP) -c -o main.o linux.cpp $(CPP) -c -o main.o linux.cpp