В сообщении от 25 мая 2006 10:44 Stéphane Magnenat написал(a): > At some point we were using an older version of SDL_ttf and to avoid > problems I included it into the sources. Can you check if glob2 works with > the most recent version of SDL_ttf ?
It really works. I've fighted with it several days ago, when I found that freetype in my distro is "broken". I've decided to get rid of included SDL_ttf. So there is my patch to link SDL_ttf dynamically (in attachment) > If so, I agree to remove it from our sources Yes, that's a fine idea :) -- With best regards Eugene A. Suchkov (a.k.a CityHawk) JID [EMAIL PROTECTED]
diff -Naur glob2-0.8.19.orig/configure.in glob2-0.8.19/configure.in --- glob2-0.8.19.orig/configure.in 2006-03-12 19:24:02 +0300 +++ glob2-0.8.19/configure.in 2006-05-22 12:06:52 +0400 @@ -59,7 +59,7 @@ AC_CHECK_LIB(SDL_net, SDLNet_UDP_Open, SDL_LIBS="$SDL_LIBS -lSDL_net", AC_MSG_ERROR([*** SDL_net library not found !]), $SDL_LIBS) dnl Check for FT2 -AC_CHECK_FT2 +dnl AC_CHECK_FT2 dnl Check for libvorbis XIPH_PATH_VORBIS diff -Naur glob2-0.8.19.orig/libgag/src/Makefile.am glob2-0.8.19/libgag/src/Makefile.am --- glob2-0.8.19.orig/libgag/src/Makefile.am 2006-01-31 23:20:49 +0300 +++ glob2-0.8.19/libgag/src/Makefile.am 2006-05-22 12:11:13 +0400 @@ -14,8 +14,6 @@ StringTable.cpp\ CursorManager.cpp\ SupportFunctions.cpp\ - SDL_ttf.c\ - SDL_ttf.h\ GUIBase.cpp\ GUIList.cpp\ GUIFileList.cpp\ @@ -36,4 +34,4 @@ TextStream.cpp\ $(libgag_a_EXTRA_SRC) -INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ [EMAIL PROTECTED]@/../include/ +INCLUDES = @SDL_CFLAGS@ [EMAIL PROTECTED]@/../include/ diff -Naur glob2-0.8.19.orig/libgag/src/Makefile.in glob2-0.8.19/libgag/src/Makefile.in --- glob2-0.8.19.orig/libgag/src/Makefile.in 2006-03-12 19:40:06 +0300 +++ glob2-0.8.19/libgag/src/Makefile.in 2006-05-22 12:27:45 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -84,10 +84,10 @@ libgag_a_EXTRA_SRC = win32_dirent.h win32_dirent.cpp -libgag_a_SOURCES = GraphicContext.cpp Sprite.cpp TrueTypeFont.cpp TrueTypeFont.h FileManager.cpp Toolkit.cpp StringTable.cpp CursorManager.cpp SupportFunctions.cpp SDL_ttf.c SDL_ttf.h GUIBase.cpp GUIList.cpp GUIFileList.cpp GUIRatio.cpp GUITextArea.cpp GUIButton.cpp GUINumber.cpp GUIText.cpp GUITextInput.cpp GUISelector.cpp GUIAnimation.cpp GUIMessageBox.cpp GUIStyle.cpp StreamBackend.cpp StreamFilter.cpp Stream.cpp BinaryStream.cpp TextStream.cpp $(libgag_a_EXTRA_SRC) +libgag_a_SOURCES = GraphicContext.cpp Sprite.cpp TrueTypeFont.cpp TrueTypeFont.h FileManager.cpp Toolkit.cpp StringTable.cpp CursorManager.cpp SupportFunctions.cpp GUIBase.cpp GUIList.cpp GUIFileList.cpp GUIRatio.cpp GUITextArea.cpp GUIButton.cpp GUINumber.cpp GUIText.cpp GUITextInput.cpp GUISelector.cpp GUIAnimation.cpp GUIMessageBox.cpp GUIStyle.cpp StreamBackend.cpp StreamFilter.cpp Stream.cpp BinaryStream.cpp TextStream.cpp $(libgag_a_EXTRA_SRC) -INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ [EMAIL PROTECTED]@/../include/ +INCLUDES = @SDL_CFLAGS@ [EMAIL PROTECTED]@/../include/ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -101,7 +101,7 @@ libgag_a_LIBADD = libgag_a_OBJECTS = GraphicContext.o Sprite.o TrueTypeFont.o \ FileManager.o Toolkit.o StringTable.o CursorManager.o \ -SupportFunctions.o SDL_ttf.o GUIBase.o GUIList.o GUIFileList.o \ +SupportFunctions.o GUIBase.o GUIList.o GUIFileList.o \ GUIRatio.o GUITextArea.o GUIButton.o GUINumber.o GUIText.o \ GUITextInput.o GUISelector.o GUIAnimation.o GUIMessageBox.o GUIStyle.o \ StreamBackend.o StreamFilter.o Stream.o BinaryStream.o TextStream.o \ @@ -229,7 +229,7 @@ ../include/SDLGraphicContext.h ../include/GAGSys.h \ ../../config.h ../include/CursorManager.h ../include/Toolkit.h \ ../include/FileManager.h ../include/SupportFunctions.h \ - SDL_ttf.h + GUIAnimation.o: GUIAnimation.cpp ../include/GUIAnimation.h \ ../include/GUIBase.h ../include/GAGSys.h ../../config.h \ ../include/GraphicContext.h ../include/SDLGraphicContext.h \ @@ -285,7 +285,6 @@ ../include/GUIBase.h ../include/GAGSys.h ../../config.h \ ../include/GraphicContext.h ../include/SDLGraphicContext.h \ ../include/CursorManager.h ../include/Toolkit.h -SDL_ttf.o: SDL_ttf.c SDL_ttf.h Sprite.o: Sprite.cpp ../include/GraphicContext.h \ ../include/SDLGraphicContext.h ../include/GAGSys.h \ ../../config.h ../include/CursorManager.h ../include/Toolkit.h \ @@ -308,11 +307,11 @@ Toolkit.o: Toolkit.cpp ../include/Toolkit.h ../include/StringTable.h \ ../include/FileManager.h ../include/GAGSys.h ../../config.h \ ../include/GraphicContext.h ../include/SDLGraphicContext.h \ - ../include/CursorManager.h TrueTypeFont.h SDL_ttf.h + ../include/CursorManager.h TrueTypeFont.h TrueTypeFont.o: TrueTypeFont.cpp TrueTypeFont.h ../include/GAGSys.h \ ../../config.h ../include/GraphicContext.h \ ../include/SDLGraphicContext.h ../include/CursorManager.h \ - SDL_ttf.h ../include/Toolkit.h ../include/SupportFunctions.h \ + ../include/Toolkit.h ../include/SupportFunctions.h \ ../include/FileManager.h win32_dirent.o: win32_dirent.cpp diff -Naur glob2-0.8.19.orig/src/Makefile.am glob2-0.8.19/src/Makefile.am --- glob2-0.8.19.orig/src/Makefile.am 2006-01-15 20:53:12 +0300 +++ glob2-0.8.19/src/Makefile.am 2006-05-22 12:35:06 +0400 @@ -192,6 +192,6 @@ glob2_LDADD = ../libgag/src/libgag.a -lGL -lGLU -lpthread $(glob2_static_lib) LIBS = else -glob2_LDADD = ../libgag/src/libgag.a @LIBS@ @FT2_LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ $(glob2_static_lib) +glob2_LDADD = ../libgag/src/libgag.a @LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ -lSDL_ttf $(glob2_static_lib) endif -INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ @VORBIS_CFLAGS@ [EMAIL PROTECTED]@/../libgag/include +INCLUDES = @SDL_CFLAGS@ @VORBIS_CFLAGS@ [EMAIL PROTECTED]@/../libgag/include diff -Naur glob2-0.8.19.orig/src/Makefile.in glob2-0.8.19/src/Makefile.in --- glob2-0.8.19.orig/src/Makefile.in 2006-03-12 19:40:07 +0300 +++ glob2-0.8.19/src/Makefile.in 2006-05-22 12:58:04 +0400 @@ -86,9 +86,9 @@ glob2_SOURCES = IntBuildingType.h IntBuildingType.cpp AI.cpp AI.h AINicowar.cpp AINicowar.h AIImplementation.h AINull.h AINull.cpp AINumbi.h AINumbi.cpp AICastor.h AICastor.cpp AIToubib.h AIToubib.cpp AIWarrush.h AIWarrush.cpp Building.cpp Building.h BuildingType.cpp BuildingType.h Bullet.h Bullet.cpp CVS Engine.cpp Engine.h EntityType.cpp EntityType.h Fatal.cpp Fatal.h GUIGlob2FileList.h GUIGlob2FileList.cpp GUIMapPreview.h GUIMapPreview.cpp Game.cpp Game.h GameGUI.cpp GameGUI.h GameGUIDialog.cpp GameGUIDialog.h GameGUILoadSave.cpp GameGUILoadSave.h Glob2.cpp Glob2.h GlobalContainer.cpp GlobalContainer.h Settings.cpp Settings.h Header.h Makefile.am Map.cpp Map.h MapGenerator.cpp MapEdit.cpp MapEdit.h NetConsts.h NetGame.cpp NetGame.h Order.cpp Order.h Player.cpp Player.h SessionConnection.cpp SessionConnection.h Race.cpp Race.h Ressource.h Ressource.cpp Sector.h Sector.cpp Session.cpp Session.h SGSL.cpp SGSL.h SoundMixer.cpp SoundMixer.h Team.cpp Team.h TeamStat.h TeamStat.cpp Unit.cpp Unit.h UnitType.cpp UnitType.h Utilities.cpp Utilities.h ChooseMapScreen.h ChooseMapScreen.cpp CustomGameScreen.h CustomGameScreen.cpp MainMenuScreen.h MainMenuScreen.cpp CreditScreen.h CreditScreen.cpp CampaignScreen.h CampaignScreen.cpp MultiplayersOfferScreen.h MultiplayersOfferScreen.cpp YOGScreen.h YOGScreen.cpp SettingsScreen.h SettingsScreen.cpp MultiplayersHostScreen.h MultiplayersHostScreen.cpp MultiplayersHost.h MultiplayersHost.cpp MultiplayersJoinScreen.h MultiplayersJoinScreen.cpp MultiplayersJoin.h MultiplayersJoin.cpp MultiplayersConnectedScreen.h MultiplayersConnectedScreen.cpp MultiplayersChooseMapScreen.h MultiplayersChooseMapScreen.cpp MultiplayersCrossConnectable.h MultiplayersCrossConnectable.cpp NonANSICStdWrapper.h NewMapScreen.h NewMapScreen.cpp YOG.h YOG.cpp MapGenerationDescriptor.h MapGenerationDescriptor.cpp LogFileManager.h LogFileManager.cpp YOGPreScreen.h YOGPreScreen.cpp ScriptEditorScreen.h ScriptEditorScreen.cpp EndGameScreen.h EndGameScreen.cpp Marshaling.h YOGConsts.h NetDefine.h Version.h RessourceType.h TerrainType.h UnitConsts.h ConfigFiles.h EntitiesTypes.h BuildingsTypes.h BuildingsTypes.cpp RessourcesTypes.h RessourcesTypes.cpp GameUtilities.h GameUtilities.cpp BitArray.h BitArray.cpp Brush.h Brush.cpp IRC.h IRC.cpp VoiceRecorder.h VoiceRecorder.cpp PerlinNoise.h PerlinNoise.cpp Glob2Screen.h Glob2Screen.cpp Glob2Style.h Glob2Style.cpp HeightMapGenerator.h HeightMapGenerator.cpp @[EMAIL PROTECTED] = ../libgag/src/libgag.a -lGL -lGLU -lpthread $(glob2_static_lib) [EMAIL PROTECTED]@glob2_LDADD = ../libgag/src/libgag.a @LIBS@ @FT2_LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ $(glob2_static_lib) [EMAIL PROTECTED]@glob2_LDADD = ../libgag/src/libgag.a @LIBS@ @SDL_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ -lSDL_ttf $(glob2_static_lib) @[EMAIL PROTECTED] = -INCLUDES = @FT2_CFLAGS@ @SDL_CFLAGS@ @VORBIS_CFLAGS@ [EMAIL PROTECTED]@/../libgag/include +INCLUDES = @SDL_CFLAGS@ @VORBIS_CFLAGS@ [EMAIL PROTECTED]@/../libgag/include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES =
_______________________________________________ glob2-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/glob2-devel
