From cb62950760c81115a473877ca7c712071a991d81 Mon Sep 17 00:00:00 2001 From: frohlich Date: Sun, 17 Dec 2006 10:12:38 +0000 Subject: [PATCH] Modified Files: utils/Modeller/Makefile.am src/FDM/YASim/Makefile.am: Remove -lssg from the linker lines. Do no longer build threedconvert. A very similar functionality is available with osgvconv. But leave threedconvert in place if somebody will need that ... --- src/FDM/YASim/Makefile.am | 4 ++-- utils/Modeller/Makefile.am | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FDM/YASim/Makefile.am b/src/FDM/YASim/Makefile.am index a5532e219..3d3e4ba51 100644 --- a/src/FDM/YASim/Makefile.am +++ b/src/FDM/YASim/Makefile.am @@ -45,9 +45,9 @@ noinst_PROGRAMS = proptest yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES) -yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) +yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES) -proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) +proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src diff --git a/utils/Modeller/Makefile.am b/utils/Modeller/Makefile.am index e5db4c47f..537a5a883 100644 --- a/utils/Modeller/Makefile.am +++ b/utils/Modeller/Makefile.am @@ -1,8 +1,8 @@ -noinst_PROGRAMS = threedconvert animassist normalmap +noinst_PROGRAMS = animassist normalmap -threedconvert_SOURCES = 3dconvert.cxx -threedconvert_LDADD = -lplibssg -lplibsg -lplibul \ - $(opengl_LIBS) $(joystick_LIBS) +# threedconvert_SOURCES = 3dconvert.cxx +# threedconvert_LDADD = -lplibssg -lplibsg -lplibul \ +# $(opengl_LIBS) $(joystick_LIBS) animassist_SOURCES = animassist.c animassist_LDADD = $(base_LIBS) -- 2.39.5