--- configure.in +++ configure.in @@ -37,6 +37,8 @@ AC_PROG_CXXCPP AC_PROG_INSTALL AC_PROG_RANLIB +AC_LIBTOOL_WIN32_DLL +AM_PROG_LIBTOOL dnl Command line arguments @@ -250,7 +252,7 @@ dnl CygWin under Windoze. dnl Multimedia library - LIBS="$LIBS -lwinmm" + LIBS="$LIBS -lgdi32 -lwinmm -lws2_32" if test "x$need_opengl" = "xyes"; then dnl OpenGL libraries Index: src/puAux/Makefile.am =================================================================== --- src/puAux/Makefile.am (revisione 2131) +++ src/puAux/Makefile.am (copia locale) @@ -1,30 +1,35 @@ if BUILD_PUAUX -lib_LIBRARIES = libplibpuaux.a +lib_LTLIBRARIES = libplibpuaux.la include_HEADERS = puAux.h puAuxLocal.h -libplibpuaux_a_SOURCES = puAux.cxx \ - puAuxBiSlider.cxx \ - puAuxBiSliderWithEnds.cxx \ - puAuxComboBox.cxx \ - puAuxCompass.cxx \ - puAuxFileSelector.cxx \ - puAuxLargeInput.cxx \ - puAuxList.cxx \ - puAuxScrollBar.cxx \ - puAuxSelectBox.cxx \ - puAuxSliderWithInput.cxx \ - puAuxSpinBox.cxx \ - puAuxTriSlider.cxx \ - puAuxVerticalMenu.cxx \ - puAuxChooser.cxx +libplibpuaux_la_SOURCES = puAux.cxx \ + puAuxBiSlider.cxx \ + puAuxBiSliderWithEnds.cxx \ + puAuxComboBox.cxx \ + puAuxCompass.cxx \ + puAuxFileSelector.cxx \ + puAuxLargeInput.cxx \ + puAuxList.cxx \ + puAuxScrollBar.cxx \ + puAuxSelectBox.cxx \ + puAuxSliderWithInput.cxx \ + puAuxSpinBox.cxx \ + puAuxTriSlider.cxx \ + puAuxVerticalMenu.cxx \ + puAuxChooser.cxx INCLUDES = -I$(top_srcdir)/src/sg \ -I$(top_srcdir)/src/pui \ -I$(top_srcdir)/src/fnt \ -I$(top_srcdir)/src/util +libplibpuaux_la_LDFLAGS = -no-undefined \ + -L@top_builddir@/src/util -lplibul \ + -L@top_builddir@/src/pui -lplibpu \ + -L@top_builddir@/src/sg -lplibsg + endif EXTRA_DIST = puAux.dsp Index: src/net/Makefile.am =================================================================== --- src/net/Makefile.am (revisione 2131) +++ src/net/Makefile.am (copia locale) @@ -1,15 +1,17 @@ if BUILD_NET -lib_LIBRARIES = libplibnet.a +lib_LTLIBRARIES = libplibnet.la include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \ netMonitor.h netSocket.h net.h -libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \ +libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \ netMessage.cxx netMonitor.cxx netSocket.cxx INCLUDES = -I$(top_srcdir)/src/util +libplibnet_la_LDFLAGS = -no-undefined -L@top_builddir@/src/util -lplibul + endif EXTRA_DIST = net.dsp Index: src/pw/Makefile.am =================================================================== --- src/pw/Makefile.am (revisione 2131) +++ src/pw/Makefile.am (copia locale) @@ -1,13 +1,15 @@ if BUILD_PW -lib_LIBRARIES = libplibpw.a +lib_LTLIBRARIES = libplibpw.la include_HEADERS = pw.h -libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx +libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx INCLUDES = -I$(top_srcdir)/src/util +libplibpw_la_LDFLAGS = -no-undefined -L@top_builddir@/src/util -lplibul + endif EXTRA_DIST = pw.dsp Index: src/fnt/Makefile.am =================================================================== --- src/fnt/Makefile.am (revisione 2131) +++ src/fnt/Makefile.am (copia locale) @@ -1,13 +1,15 @@ if BUILD_FNT -lib_LIBRARIES = libplibfnt.a +lib_LTLIBRARIES = libplibfnt.la include_HEADERS = fnt.h -libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx +libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util +libplibfnt_la_LDFLAGS = -no-undefined -L@top_builddir@/src/util -lplibul + endif EXTRA_DIST = fnt.dsp Index: src/sg/Makefile.am =================================================================== --- src/sg/Makefile.am (revisione 2131) +++ src/sg/Makefile.am (copia locale) @@ -1,15 +1,17 @@ if BUILD_SG -lib_LIBRARIES = libplibsg.a +lib_LTLIBRARIES = libplibsg.la include_HEADERS = sg.h -libplibsg_a_SOURCES = sg.cxx sgd.cxx \ - sgIsect.cxx sgdIsect.cxx \ - sgPerlinNoise.cxx +libplibsg_la_SOURCES = sg.cxx sgd.cxx \ + sgIsect.cxx sgdIsect.cxx \ + sgPerlinNoise.cxx INCLUDES = -I$(top_srcdir)/src/util +libplibsg_la_LDFLAGS = -no-undefined -L@top_builddir@/src/util -lplibul + endif EXTRA_DIST = sg.dsp Index: src/Makefile.am =================================================================== --- src/Makefile.am (revisione 2131) +++ src/Makefile.am (copia locale) @@ -1 +1 @@ -SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw +SUBDIRS = util fnt js sl pui sg puAux ssg ssgAux net psl pw Index: src/ssgAux/Makefile.am =================================================================== --- src/ssgAux/Makefile.am (revisione 2131) +++ src/ssgAux/Makefile.am (copia locale) @@ -1,6 +1,6 @@ if BUILD_SSGAUX -lib_LIBRARIES = libplibssgaux.a +lib_LTLIBRARIES = libplibssgaux.la include_HEADERS = ssgAux.h \ ssgaShapes.h \ @@ -13,27 +13,32 @@ ssgaFire.h \ ssgaBillboards.h -libplibssgaux_a_SOURCES = ssgAux.cxx \ - ssgaShapes.cxx \ - ssgaPatch.cxx \ - ssgaParticleSystem.cxx \ - ssgaWaveSystem.cxx \ - ssgaLensFlare.cxx \ - ssgaLensFlareTexture.cxx \ - ssgaFire.cxx \ - ssgaScreenDump.cxx \ - ssgaSphere.cxx \ - ssgaCelestialBody.cxx \ - ssgaCloudLayer.cxx \ - ssgaStars.cxx \ - ssgaSkyDome.cxx \ - ssgaSky.cxx \ - ssgaTeapot.cxx \ - ssgaBillboards.cxx +libplibssgaux_la_SOURCES = ssgAux.cxx \ + ssgaShapes.cxx \ + ssgaPatch.cxx \ + ssgaParticleSystem.cxx \ + ssgaWaveSystem.cxx \ + ssgaLensFlare.cxx \ + ssgaLensFlareTexture.cxx \ + ssgaFire.cxx \ + ssgaScreenDump.cxx \ + ssgaSphere.cxx \ + ssgaCelestialBody.cxx \ + ssgaCloudLayer.cxx \ + ssgaStars.cxx \ + ssgaSkyDome.cxx \ + ssgaSky.cxx \ + ssgaTeapot.cxx \ + ssgaBillboards.cxx INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/ssg INCLUDES += -I$(top_srcdir)/src/util +libplibssgaux_la_LDFLAGS = -no-undefined \ + -L@top_builddir@/src/util -lplibul \ + -L@top_builddir@/src/sg -lplibsg \ + -L@top_builddir@/src/ssg -lplibssg + endif EXTRA_DIST = ssgAux.dsp Index: src/js/Makefile.am =================================================================== --- src/js/Makefile.am (revisione 2131) +++ src/js/Makefile.am (copia locale) @@ -1,15 +1,17 @@ if BUILD_JS -lib_LIBRARIES = libplibjs.a +lib_LTLIBRARIES = libplibjs.la include_HEADERS = js.h -libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \ +libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \ jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \ jsNone.cxx INCLUDES = -I$(top_srcdir)/src/util +libplibjs_la_LDFLAGS = -no-undefined -L@top_builddir@/src/util -lplibul + endif EXTRA_DIST = js.dsp Index: src/ssg/Makefile.am =================================================================== --- src/ssg/Makefile.am (revisione 2131) +++ src/ssg/Makefile.am (copia locale) @@ -1,10 +1,10 @@ if BUILD_SSG -lib_LIBRARIES = libplibssg.a +lib_LTLIBRARIES = libplibssg.la include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h -libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \ +libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \ ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \ ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \ ssgLoadDOF.cxx ssgLoadAC.cxx \ @@ -31,6 +31,10 @@ INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util +libplibssg_la_LDFLAGS = -no-undefined \ + -L@top_builddir@/src/util -lplibul \ + -L@top_builddir@/src/sg -lplibsg + endif EXTRA_DIST = ssg.dsp Index: src/pui/Makefile.am =================================================================== --- src/pui/Makefile.am (revisione 2131) +++ src/pui/Makefile.am (copia locale) @@ -1,10 +1,10 @@ if BUILD_PUI -lib_LIBRARIES = libplibpu.a +lib_LTLIBRARIES = libplibpu.la include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h -libplibpu_a_SOURCES = \ +libplibpu_la_SOURCES = \ pu.cxx puBox.cxx puButton.cxx puButtonBox.cxx \ puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \ puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \ @@ -18,6 +18,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/fnt AM_CPPFLAGS += -I$(top_srcdir)/src/util +libplibpu_la_LDFLAGS = -no-undefined \ + -L@top_builddir@/src/util -lplibul \ + -L@top_builddir@/src/fnt -lplibfnt + endif EXTRA_DIST = pui.dsp Index: src/util/Makefile.am =================================================================== --- src/util/Makefile.am (revisione 2131) +++ src/util/Makefile.am (copia locale) @@ -1,12 +1,14 @@ if BUILD_UL -lib_LIBRARIES = libplibul.a +lib_LTLIBRARIES = libplibul.la include_HEADERS = ul.h ulRTTI.h -libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \ +libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \ ulList.cxx ulLocal.h ulRTTI.cxx +libplibul_la_LDFLAGS = -no-undefined + endif EXTRA_DIST = ul.dsp Index: src/psl/Makefile.am =================================================================== --- src/psl/Makefile.am (revisione 2131) +++ src/psl/Makefile.am (copia locale) @@ -1,19 +1,21 @@ if BUILD_PSL -lib_LIBRARIES = libplibpsl.a +lib_LTLIBRARIES = libplibpsl.la include_HEADERS = psl.h -libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \ - pslCompiler.cxx pslSymbols.cxx pslToken.cxx \ - pslExpression.cxx pslProgram.cxx pslDump.cxx \ - pslError.cxx pslFileIO.cxx pslCompiler.h \ - pslContext.h pslFileIO.h pslLocal.h \ - pslOpcodes.h pslSymbol.h +libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \ + pslCompiler.cxx pslSymbols.cxx pslToken.cxx \ + pslExpression.cxx pslProgram.cxx pslDump.cxx \ + pslError.cxx pslFileIO.cxx pslCompiler.h \ + pslContext.h pslFileIO.h pslLocal.h \ + pslOpcodes.h pslSymbol.h INCLUDES = -I$(top_srcdir)/src/util +libplibpsl_la_LDFLAGS = -no-undefined -L@top_builddir@/src/util -lplibul + endif EXTRA_DIST = psl.dsp Index: src/sl/Makefile.am =================================================================== --- src/sl/Makefile.am (revisione 2131) +++ src/sl/Makefile.am (copia locale) @@ -1,19 +1,23 @@ if BUILD_SL -lib_LIBRARIES = libplibsl.a libplibsm.a +lib_LTLIBRARIES = libplibsl.la libplibsm.la include_HEADERS = sl.h slPortability.h sm.h -libplibsl_a_SOURCES = \ +libplibsl_la_SOURCES = \ slDSP.cxx slSample.cxx slEnvelope.cxx \ slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \ slScheduler.cxx slMODdacio.cxx slMODfile.cxx \ slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h -libplibsm_a_SOURCES = slPortability.h smMixer.cxx +libplibsm_la_SOURCES = slPortability.h smMixer.cxx INCLUDES = -I$(top_srcdir)/src/util +libplibsl_la_LDFLAGS = -no-undefined -L@top_builddir@/src/util -lplibul + +libplibsm_la_LDFLAGS = -no-undefined -L@top_builddir@/src/util -lplibul + endif EXTRA_DIST = sl.dsp