Merge branch 'tat/configure' into next
This commit is contained in:
commit
3d01c59a7e
5 changed files with 46 additions and 12 deletions
|
@ -1,11 +1,22 @@
|
|||
noinst_PROGRAMS = GPSsmooth MIDGsmooth UGsmooth
|
||||
|
||||
if HAVE_FRAMEWORK_PLIB
|
||||
GPSsmooth_LDFLAGS = $(plib_FRAMEWORK)
|
||||
MIDGsmooth_LDFLAGS = $(plib_FRAMEWORK)
|
||||
UGsmooth_LDFLAGS = $(plib_FRAMEWORK)
|
||||
else
|
||||
GPSsmooth_PLIB_LIBS = -lplibnet -lplibul
|
||||
MIDGsmooth_PLIB_LIBS = -lplibnet -lplibul
|
||||
UGsmooth_PLIB_LIBS = -lplibnet -lplibul
|
||||
endif
|
||||
|
||||
|
||||
GPSsmooth_SOURCES = \
|
||||
gps.cxx gps.hxx \
|
||||
gps_main.cxx
|
||||
|
||||
GPSsmooth_LDADD = \
|
||||
-lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul \
|
||||
$(GPSsmooth_PLIB_LIBS) -lsgtiming -lsgmisc -lsgdebug \
|
||||
$(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
|
||||
|
||||
MIDGsmooth_SOURCES = \
|
||||
|
@ -13,9 +24,8 @@ MIDGsmooth_SOURCES = \
|
|||
MIDG_main.cxx
|
||||
|
||||
MIDGsmooth_LDADD = \
|
||||
-lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug \
|
||||
-lsgstructure \
|
||||
-lplibnet -lplibul \
|
||||
$(MIDGsmooth_PLIB_LIBS) -lsgio -lsgserial -lsgtiming \
|
||||
-lsgmath -lsgbucket -lsgmisc -lsgdebug -lsgstructure \
|
||||
$(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
|
||||
|
||||
UGsmooth_SOURCES = \
|
||||
|
@ -26,9 +36,8 @@ UGsmooth_SOURCES = \
|
|||
UGear_telnet.cxx UGear_telnet.hxx
|
||||
|
||||
UGsmooth_LDADD = \
|
||||
-lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug \
|
||||
-lplibnet -lplibul \
|
||||
$(UGsmooth_PLIB_LIBS) -lsgio -lsgserial -lsgtiming \
|
||||
-lsgmath -lsgbucket -lsgmisc -lsgdebug \
|
||||
$(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
|
||||
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep propmerge
|
||||
DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep propmerge fgpanel
|
||||
|
||||
SUBDIRS = GPSsmooth TerraSync Modeller js_server propmerge fgviewer
|
||||
SUBDIRS = GPSsmooth TerraSync Modeller js_server propmerge fgviewer fgpanel
|
||||
|
||||
|
|
|
@ -6,4 +6,10 @@ terrasync_SOURCES = terrasync.cxx
|
|||
|
||||
AM_CPPFLAGS = $(svn_CPPFLAGS)
|
||||
|
||||
terrasync_LDADD = -lplibnet -lplibul -lsgmisc -lsgdebug $(network_LIBS) $(svn_LIBS)
|
||||
if HAVE_FRAMEWORK_PLIB
|
||||
terrasync_LDFLAGS = $(plib_FRAMEWORK)
|
||||
else
|
||||
terrasync_PLIB_LIBS = -lplibnet -lplibul
|
||||
endif
|
||||
|
||||
terrasync_LDADD = $(terrasync_PLIB_LIBS) -lsgmisc -lsgdebug $(network_LIBS) $(svn_LIBS)
|
||||
|
|
|
@ -3,8 +3,21 @@ AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
|
|||
|
||||
bin_PROGRAMS = fgviewer
|
||||
|
||||
if HAVE_FRAMEWORK_PLIB
|
||||
fgviewer_LDFLAGS = $(plib_FRAMEWORK)
|
||||
else
|
||||
fgviewer_PLIB_LIBS = -lplibul
|
||||
fgviewer_LDFLAGS =
|
||||
endif
|
||||
|
||||
if HAVE_FRAMEWORK_OSG
|
||||
fgviewer_LDFLAGS += $(osg_FRAMEWORKS) $(openthreads_FRAMEWORK)
|
||||
else
|
||||
fgviewer_LDFLAGS += $(osg_LIBS) $(openthreads_LIBS)
|
||||
endif
|
||||
|
||||
fgviewer_SOURCES = fgviewer.cxx
|
||||
fgviewer_LDADD = \
|
||||
-lsgtgdb -lsgmaterial -lsgmodel -lsgbvh -lsgutil -lsgio -lsgbucket \
|
||||
-lsgmath -lsgprops -lsgdebug -lsgmisc -lsgxml -lsgstructure \
|
||||
-lplibul $(OSG_LIBS) $(opengl_LIBS) $(THREAD_LIBS) -lz
|
||||
$(fgviewer_PLIB_LIBS) $(OSG_LIBS) $(opengl_LIBS) $(THREAD_LIBS) -lz
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
noinst_PROGRAMS = js_server
|
||||
|
||||
if HAVE_FRAMEWORK_PLIB
|
||||
js_server_LDFLAGS = $(plib_FRAMEWORK)
|
||||
else
|
||||
js_server_PLIB_LIBS = -lplibjs -lplibnet -lplibul
|
||||
endif
|
||||
|
||||
js_server_SOURCES = js_server.cxx
|
||||
js_server_LDADD = -lplibjs -lplibnet -lplibul $(base_LIBS) $(joystick_LIBS) $(network_LIBS)
|
||||
js_server_LDADD = $(js_server_PLIB_LIBS) $(base_LIBS) $(joystick_LIBS) $(network_LIBS)
|
||||
|
|
Loading…
Add table
Reference in a new issue