Merge remote-tracking branch 'iku/iku'

This commit is contained in:
Bill Currie 2011-12-10 20:57:03 +09:00
commit af16a29bfb
2 changed files with 4 additions and 2 deletions

View file

@ -32,6 +32,7 @@ AUTOMAKE_OPTIONS= foreign
#
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include
SDL_LIBS = @SDL_LIBS@
AM_CFLAGS= @PTHREAD_CFLAGS@
bin_PROGRAMS= @NQ_TARGETS@
@ -45,7 +46,7 @@ libnq_common_a_SOURCES=game.c world.c
libnq_sdl_a_SOURCES= sys_sdl.c
libnq_sdl_a_CFLAGS= $(SDL_CFLAGS)
common_ldflags= -export-dynamic
common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
cl_plugin_LIBS= \
$(SERVER_PLUGIN_STATIC_LIBS) \

View file

@ -32,6 +32,7 @@ AUTOMAKE_OPTIONS= foreign
# Stuff that is common to both client and server
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CPPFLAGS@
SDL_LIBS = @SDL_LIBS@
AM_CFLAGS= @PTHREAD_CFLAGS@
bin_PROGRAMS= @QW_TARGETS@
@ -48,7 +49,7 @@ libqw_common_a_SOURCES=\
libqw_sdl_a_SOURCES=cl_sys_sdl.c
libqw_sdl_a_CFLAGS=$(SDL_CFLAGS)
common_ldflags= -export-dynamic
common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
# Server builds
#