2013-04-17 15:46:37 +02:00
|
|
|
--- src/core.mk.orig 2013-03-21 23:45:14.000000000 +0400
|
|
|
|
+++ src/core.mk 2013-04-16 21:14:33.351621428 +0400
|
2012-09-04 00:33:43 +02:00
|
|
|
@@ -3,7 +3,6 @@
|
2013-04-17 15:46:37 +02:00
|
|
|
APPSERVER=$(APPNAME)_server
|
2012-09-04 00:33:43 +02:00
|
|
|
|
2009-12-21 10:28:57 +01:00
|
|
|
#CXXFLAGS= -ggdb3
|
2009-05-09 14:19:58 +02:00
|
|
|
-CXXFLAGS= -O3 -fomit-frame-pointer
|
2011-07-27 00:09:35 +02:00
|
|
|
override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
|
2006-04-30 12:25:12 +02:00
|
|
|
|
2009-05-09 14:19:58 +02:00
|
|
|
PLATFORM= $(shell uname -s)
|
2013-04-17 15:46:37 +02:00
|
|
|
@@ -65,8 +64,8 @@
|
2012-09-04 00:33:43 +02:00
|
|
|
CLIENT_INCLUDES= $(INCLUDES) -Iinclude
|
|
|
|
CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
|
2009-12-21 10:28:57 +01:00
|
|
|
else
|
2012-09-04 00:33:43 +02:00
|
|
|
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
|
2011-06-28 02:19:36 +02:00
|
|
|
-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
|
2012-09-04 00:33:43 +02:00
|
|
|
+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
|
2011-06-28 02:19:36 +02:00
|
|
|
+CLIENT_LIBS= -Lenet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
|
2009-05-09 14:19:58 +02:00
|
|
|
endif
|
|
|
|
ifeq ($(PLATFORM),Linux)
|
2008-06-29 22:34:11 +02:00
|
|
|
CLIENT_LIBS+= -lrt
|