fix as-needed issues - build with external expat --- Make-default.mk.orig 2006-12-31 00:05:51 +0300 +++ Make-default.mk 2006-12-31 00:09:56 +0300 @@ -478,7 +478,7 @@ ifdef SOLIBRARY ${SOLIBRARY}: ${OBJECTS} - ${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS} + ${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${EXT_LIBS} ${DEBUG_LIBS} @D=`pwd` ; \ createdir="${EXPORTBASE}/lib" ; \ $(mkinstalldirs) $$createdir ; \ --- configure.in.orig 2006-11-05 04:42:45 +0300 +++ configure.in 2006-12-31 00:18:36 +0300 @@ -131,6 +131,8 @@ dnl Replace `main' with a function in -lpng: AC_CHECK_LIB(png, png_init_io,,AC_MSG_ERROR([Can't find libpng. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) +AC_CHECK_LIB(expat, XML_Parse,,AC_MSG_ERROR([Can't find libexpat. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) + AC_CHECK_LIB(GL, glGetString,,AC_MSG_ERROR([Can't find libGL. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) AC_CHECK_LIB(GLU, gluOrtho2D,,AC_MSG_ERROR([Can't find libGLU. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) AC_CHECK_LIB(glut, glutSwapBuffers,,AC_MSG_ERROR([Can't find libglut. freeglut can be found on http://freeglut.sourceforge.net/])) --- Makefile.orig 2006-12-31 00:46:42 +0300 +++ src/libs/client/Makefile 2006-12-31 00:33:35 +0300 @@ -23,7 +23,7 @@ SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \ optionmenu.cpp -LIBS = -lplibssg -lplibsg -lplibul +LIBS = -lplibssg -lplibsg -lplibul -lconfscreens -lraceengine EXPDIR = include --- Makefile.orig 2006-11-05 04:42:22 +0300 +++ src/libs/Makefile 2006-12-31 00:50:38 +0300 @@ -18,12 +18,12 @@ SHIPSUBDIRS = tgf tgfclient raceengineclient learning -EXPINCDIRS = txml tgf tgfclient client confscreens racescreens robottools raceengineclient learning \ +EXPINCDIRS = txml tgf tgfclient confscreens racescreens robottools raceengineclient client learning \ portability math TOOLSUBDIRS = txml -SUBDIRS = confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \ +SUBDIRS = confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \ portability math PKGSUBDIRS = $(SUBDIRS) --- Makefile.orig 2006-11-05 04:42:20 +0300 +++ src/libs/raceengineclient/Makefile 2006-12-31 00:57:17 +0300 @@ -20,6 +20,8 @@ SOLIBDIR = . +LIBS = -lracescreens -lrobottools + SOURCES = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \ raceengine.cpp raceresults.cpp FIXME: leave internal xmlparse.h for nonbroken build with #include "xmlparse.h" --- Makefile.orig 2006-11-05 04:42:17 +0300 +++ src/libs/txml/Makefile 2006-12-31 21:11:44 +0300 @@ -24,11 +24,13 @@ SOLIBDIR = . -SOURCES = xmltok.c xmlrole.c xmlparse.c hashtable.c xml.cpp +LIBS = -lexpat + +SOURCES = xml.cpp EXPDIR = include -EXPORTS = xml.h xmlparse.h +EXPORTS = xml.h xmlparse.h PKGSUBDIRS = gennmtab diff -pruN torcs_1.2.3-1/debian/torcs.desktop torcs_1.2.4-1ubuntu3/debian/torcs.desktop --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ TORCS.desktop 2005-12-25 16:42:08.000000000 +0000 @@ -0,0 +1,16 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Type=Application +Name=TORCS +GenericName=TORCS +Comment=3D racing cars simulator game +Comment[es]=Juego de simulaciĆ³n 3D de carrera de autos +Icon=TORCS.xpm + +FilePattern=torcs +Exec=torcs +Terminal=false +StartupNotify=false + +Categories=Application;Game;Simulation;3DGraphics; --- src/modules/graphic/ssggraph/Makefile.orig 2006-11-05 04:42:26 +0300 +++ src/modules/graphic/ssggraph/Makefile 2007-10-08 02:01:39 +0400 @@ -24,7 +24,7 @@ MODULE = ssggraph.so MODULEDIR = modules/graphic -LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal +LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal -lalut -lGLU -lz SHIPDIR = config