Tatsuhiro Nishioka:

Patches for configure.ac and Makefile.am files in FG/SG so Mac developers can build these in a unix way.
These also enables Mac developers to choose either PLIB framework or PLIB static libs.
This commit is contained in:
torsten
2009-09-17 12:24:56 +02:00
committed by Tim Moore
parent ccf0ba50c4
commit dc2c437a1a
3 changed files with 118 additions and 6 deletions
+22 -4
View File
@@ -26,36 +26,54 @@ noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
tcp_server_SOURCES = tcp_server.cxx
if HAVE_FRAMEWORK_PLIB
tcp_server_LDFLAGS = $(plib_FRAMEWORK)
else
tcp_server_PLIB_LIBS = -lplibnet -lplibul
endif
tcp_server_LDADD = \
libsgio.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
-lplibnet -lplibul -lz \
$(tcp_server_PLIB_LIBS) -lz \
$(network_LIBS) \
$(base_LIBS)
tcp_client_SOURCES = tcp_client.cxx
if HAVE_FRAMEWORK_PLIB
tcp_client_LDFLAGS = $(plib_FRAMEWORK)
else
tcp_client_PLIB_LIBS = -lplibnet -lplibul
endif
tcp_client_LDADD = \
libsgio.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
-lplibnet -lplibul -lz \
$(tcp_client_PLIB_LIBS) -lz \
$(network_LIBS) \
$(base_LIBS)
socktest_SOURCES = socktest.cxx
if HAVE_FRAMEWORK_PLIB
socktest_LDFLAGS = $(plib_FRAMEWORK)
else
socktest_PLIB_LIBS = -lplibnet -lplibul
endif
socktest_LDADD = \
libsgio.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
-lplibnet -lplibul -lz \
$(socktest_PLIB_LIBS) -lz
$(network_LIBS) \
$(base_LIBS)
$(base_LIBS)
lowtest_SOURCES = lowtest.cxx
+7 -2
View File
@@ -20,7 +20,12 @@ props_test_LDADD = \
$(top_builddir)/simgear/xml/libsgxml.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/structure/libsgstructure.a \
-lOpenThreads
$(top_builddir)/simgear/structure/libsgstructure.a
if HAVE_FRAMEWORK_OSG
props_test_LDFLAGS = $(openthreads_FRAMEWORK)
else
props_test_LDFLAGS = -lOpenThreads
endif
INCLUDES = -I$(top_srcdir)