File kajaani-kombat-fix-build.patch of Package kajaani-kombat

Overview Repositories Revisions Requests Users Attributes Meta

File kajaani-kombat-fix-build.patch of Package kajaani-kombat (Revision 8a97e7bd69fa0d54afb05e21d043bb6f)

Currently displaying revision 8a97e7bd69fa0d54afb05e21d043bb6f , Show latest

diff --git a/Makefile b/Makefile
index a78e149..785ec2d 100644
--- a/Makefile
+++ b/Makefile
@@ -29,17 +29,17 @@ ifeq ($(sys), WIN)
 endif
 ## UNIX RELEASE
 ifeq ($(sys), UNIX )
-	MEDIA=-D MEDIA_PATH=\"./\"
+	MEDIA=-D MEDIA_PATH=\"/usr/share/kajaani-kombat/\"
 	DEBUG= -O $(MEDIA)
 endif
 ## UNIX DEBUG
 ifeq ($(sys), DEBUG)
-	MEDIA=-D MEDIA_PATH=\"./\"
+	MEDIA=-D MEDIA_PATH=\"/usr/share/kajaani-kombat/\"
 	DEBUG= -g -DDEBUG $(MEDIA)
 endif
 ## UNIX RELEASE (default option)
 ifeq ($(sys), )
-	MEDIA=-D MEDIA_PATH=\"./\"
+	MEDIA=-D MEDIA_PATH=\"/usr/share/kajaani-kombat/\"
 	DEBUG= -O $(MEDIA)
 endif
 
@@ -47,7 +47,7 @@ endif
 INS=/usr/bin/install
 
 client_libs = `sdl-config --libs` -lSDL_net -lSDL_image -lSDL_ttf -lSDL_mixer
-server_libs = `sdl-config --libs` -lSDL_net -lcurses
+server_libs = `sdl-config --libs` -lSDL_net `pkg-config --libs ncursesw`
 
 client_objs = game_obj.o terrain.o msg.o rotozoom.o gfx.o game_client.o main.o coord.o block.o \
 	particle_efects.o animation.o gfx_functions.o gui.o gui_screens.o game_server.o audio.o\
@@ -55,8 +55,7 @@ client_objs = game_obj.o terrain.o msg.o rotozoom.o gfx.o game_client.o main.o c
 
 server_objs = game_obj.o terrain.o msg.o game_server.o server_main.o coord.o block.o connects.o player.o config.o
 
-CXXFLAGS=`sdl-config --cflags` -Wall $(DEBUG)
-
+CXXFLAGS+=`sdl-config --cflags` `pkg-config --cflags ncursesw` -Wno-deprecated -Wall $(DEBUG)
 all: client
 
 config.o: config.h config.cpp
@@ -85,9 +84,9 @@ connects.o: connects.h connects.cpp msg.h globals.h
 client_net.o: client_net.h client_net.cpp globals.h monitor_queue.h msg.h
 
 client: $(client_objs)
-	$(CXX) $(client_objs) -o kajaani-kombat $(client_libs)
+	$(CXX) $(LDFLAGS) $(client_objs) -o kajaani-kombat $(client_libs)
 server: $(server_objs)
-	$(CXX) $(server_objs) -o kajaani-kombat-server $(server_libs)
+	$(CXX) $(LDFLAGS) $(server_objs) -o kajaani-kombat-server $(server_libs)
 
 .PHONY: all clean client server install

Places

File kajaani-kombat-fix-build.patch of Package kajaani-kombat (Revision 8a97e7bd69fa0d54afb05e21d043bb6f)

Places