1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00

- fixes for autotools build

This commit is contained in:
Ivan Savenko 2012-10-26 12:57:18 +00:00
parent c05c05962d
commit 8604234f8d
6 changed files with 8 additions and 8 deletions

View File

@ -4,7 +4,7 @@ StdInc.h.gch: StdInc.h
$(CXXCOMPILE) -DVCMI_DLL -fPIC -c $< $(CXXCOMPILE) -DVCMI_DLL -fPIC -c $<
vcmiscripting_LTLIBRARIES = libvcmiERM.la vcmiscripting_LTLIBRARIES = libvcmiERM.la
libvcmiERM_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ libvcmiERM_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@
libvcmiERM_la_CXXFLAGS = -DVCMI_DLL libvcmiERM_la_CXXFLAGS = -DVCMI_DLL
libvcmiERM_la_SOURCES = \ libvcmiERM_la_SOURCES = \
ERMInterpreter.cpp \ ERMInterpreter.cpp \

View File

@ -277,7 +277,7 @@ top_srcdir = @top_srcdir@
vcmiscriptingdir = $(VCMI_SCRIPTING_LIBS_DIR) vcmiscriptingdir = $(VCMI_SCRIPTING_LIBS_DIR)
BUILT_SOURCES = StdInc.h.gch BUILT_SOURCES = StdInc.h.gch
vcmiscripting_LTLIBRARIES = libvcmiERM.la vcmiscripting_LTLIBRARIES = libvcmiERM.la
libvcmiERM_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ libvcmiERM_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@
libvcmiERM_la_CXXFLAGS = -DVCMI_DLL libvcmiERM_la_CXXFLAGS = -DVCMI_DLL
libvcmiERM_la_SOURCES = \ libvcmiERM_la_SOURCES = \
ERMInterpreter.cpp \ ERMInterpreter.cpp \

View File

@ -1,7 +1,7 @@
bin_PROGRAMS = vcmiclient bin_PROGRAMS = vcmiclient
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_DATA = vcmiclient.desktop desktop_DATA = icons/vcmiclient.desktop
EXTRA_DIST = \ EXTRA_DIST = \
${desktop_DATA} ${desktop_DATA}
@ -16,7 +16,7 @@ BUILT_SOURCES = StdInc.h.gch
StdInc.h.gch: StdInc.h StdInc.h.gch: StdInc.h
$(CXXCOMPILE) -c $< $(CXXCOMPILE) -c $<
vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lz
vcmiclient_CXXFLAGS = @SDL_CFLAGS@ @FFMPEG_CXXFLAGS@ vcmiclient_CXXFLAGS = @SDL_CFLAGS@ @FFMPEG_CXXFLAGS@
vcmiclient_LDFLAGS = -L$(top_builddir)/lib vcmiclient_LDFLAGS = -L$(top_builddir)/lib
vcmiclient_SOURCES = \ vcmiclient_SOURCES = \

View File

@ -306,12 +306,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_DATA = vcmiclient.desktop desktop_DATA = icons/vcmiclient.desktop
EXTRA_DIST = \ EXTRA_DIST = \
${desktop_DATA} ${desktop_DATA}
BUILT_SOURCES = StdInc.h.gch BUILT_SOURCES = StdInc.h.gch
vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lz
vcmiclient_CXXFLAGS = @SDL_CFLAGS@ @FFMPEG_CXXFLAGS@ vcmiclient_CXXFLAGS = @SDL_CFLAGS@ @FFMPEG_CXXFLAGS@
vcmiclient_LDFLAGS = -L$(top_builddir)/lib vcmiclient_LDFLAGS = -L$(top_builddir)/lib
vcmiclient_SOURCES = \ vcmiclient_SOURCES = \

View File

@ -3,7 +3,7 @@ StdInc.h.gch: StdInc.h
$(CXXCOMPILE) -DVCMI_DLL -fPIC -c $< $(CXXCOMPILE) -DVCMI_DLL -fPIC -c $<
pkglib_LTLIBRARIES = libvcmi.la pkglib_LTLIBRARIES = libvcmi.la
libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz -lpthread libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lz -lpthread
libvcmi_la_CXXFLAGS = @SDL_CFLAGS@ -DVCMI_DLL libvcmi_la_CXXFLAGS = @SDL_CFLAGS@ -DVCMI_DLL
libvcmi_la_SOURCES = \ libvcmi_la_SOURCES = \
../Global.h \ ../Global.h \

View File

@ -294,7 +294,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
BUILT_SOURCES = StdInc.h.gch BUILT_SOURCES = StdInc.h.gch
pkglib_LTLIBRARIES = libvcmi.la pkglib_LTLIBRARIES = libvcmi.la
libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz -lpthread libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lz -lpthread
libvcmi_la_CXXFLAGS = @SDL_CFLAGS@ -DVCMI_DLL libvcmi_la_CXXFLAGS = @SDL_CFLAGS@ -DVCMI_DLL
libvcmi_la_SOURCES = \ libvcmi_la_SOURCES = \
../Global.h \ ../Global.h \