You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
135 lines
5.3 KiB
135 lines
5.3 KiB
diff -ru atanks-4.6.orig/src/Makefile atanks-4.6/src/Makefile
|
|
--- atanks-4.6.orig/src/Makefile 2010-05-24 12:30:23.000000000 -0400
|
|
+++ atanks-4.6/src/Makefile 2010-06-02 03:22:25.112064819 -0400
|
|
@@ -4,9 +4,6 @@
|
|
missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
|
|
update.o network.o floattext.o land.o text.o client.o gameloop.o
|
|
|
|
-CPP=g++
|
|
-CC=gcc
|
|
-LD=g++
|
|
LIB=ar
|
|
WINDRES=
|
|
# FLAGS += -DDATA_DIR=\".\" -Wno-write-strings -DNETWORK -DTHREADS
|
|
@@ -15,9 +12,9 @@
|
|
WFLAGS =
|
|
OFLAGS =
|
|
LFLAGS +=
|
|
-LDFLAGS = `allegro-config --libs`
|
|
+LDFLAGS += `allegro-config --libs`
|
|
|
|
-CFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage
|
|
+CXXFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage
|
|
|
|
SRCS = $(MODULES:.o=.cpp)
|
|
GLOBALS = main.h imagedefs.h externs.h
|
|
@@ -33,82 +30,82 @@
|
|
$(MODULES): Makefile
|
|
|
|
atanks.o: atanks.cpp globals.h main.h menucontent.h
|
|
- $(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
button.o: button.cpp button.h
|
|
- $(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
client.o: client.h client.cpp
|
|
- $(CPP) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CFLAGS)
|
|
+ $(CXX) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CXXFLAGS)
|
|
|
|
environment.o: environment.cpp environment.h
|
|
- $(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
explosion.o: explosion.cpp explosion.h
|
|
- $(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
files.o: files.cpp files.h text.h text.cpp
|
|
- $(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
floattext.o: floattext.cpp floattext.h
|
|
- $(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
gameloop.o: gameloop.cpp atanks.cpp main.h
|
|
- $(CPP) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
globaldata.o: globaldata.cpp globaldata.h
|
|
- $(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
land.o: land.cpp land.h globaldata.h environment.h
|
|
- $(CPP) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
missile.o: missile.cpp missile.h
|
|
- $(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
teleport.o: teleport.cpp teleport.h
|
|
- $(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
physobj.o: physobj.cpp physobj.h
|
|
- $(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
player.o: player.cpp player.h
|
|
- $(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
tank.o: tank.cpp tank.h
|
|
- $(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
team.o: team.cpp team.h
|
|
- $(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
virtobj.o: virtobj.cpp virtobj.h
|
|
- $(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
fade.o: fade.cpp
|
|
- $(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
perlin.o: perlin.cpp
|
|
- $(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
sky.o: sky.cpp sky.h
|
|
- $(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
satellite.o: satellite.cpp satellite.h
|
|
- $(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
text.o: text.cpp text.h
|
|
- $(CPP) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
update.o: update.cpp update.h
|
|
- $(CPP) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
network.o: network.cpp network.h
|
|
- $(CPP) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
%.o: %.cpp %.h
|
|
- $(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
|
|
+ $(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
|
|
|
|
$(OUTPUT): $(OBJECTS) $(MODULES)
|
|
- $(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
|
|
+ $(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CXXFLAGS)
|
|
# strip $(OUTPUT)
|
|
|
|
# dependencies:
|