Attachment #164657 for bug #232592




++ configure.in

AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. 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(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
AC_CHECK_LIB(alut, alutLoadWAVFile,
	LIBS="$LIBS -lalut", )
	LDFLAGS="$LDFLAGS")

AC_CHECK_LIB(dl, dlopen)
AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. 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\"]))
++ Make-default.mk

ifdef PROGRAM

${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}

installprogram: ${PROGRAM}
	@ createdir="${INSTLIBBASE}" ; \

ifdef LOCALTOOLS

${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}

endif

ifdef TOOLS

${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}

installtools: ${TOOLS}
	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \

ifdef SOLIBRARY

${SOLIBRARY}: ${OBJECTS}
	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
	@D=`pwd` ; \
	createdir="${EXPORTBASE}/lib" ; \
	$(mkinstalldirs) $$createdir ; \

ifdef MODULE

${MODULE}: ${OBJECTS}
	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
	@D=`pwd` ; \
	createdir="${EXPORTBASE}/${MODULEDIR}" ; \
	$(mkinstalldirs) $$createdir ; \
++ src/libs/client/Makefile

SOURCES   = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
	    optionmenu.cpp

SOLIBS    = -lconfscreens -lraceengine

LIBS      =  -lplibssg -lplibsg -lplibul

EXPDIR    = include
++ src/libs/Makefile


TOOLSUBDIRS	= txml

SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
			  portability math

PKGSUBDIRS	= $(SUBDIRS)
++ src/libs/raceengineclient/Makefile

SOURCES      = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \
	       raceengine.cpp raceresults.cpp

SOLIBS       = -lconfscreens -lrobottools -lracescreens

EXPDIR       = include

EXPORTS      = singleplayer.h raceinit.h
++ src/libs/tgf/Makefile

		profiler.cpp \
		hash.cpp

SOLIBS  = -ltxml

EXPDIR  = include


Return to bug 232592

Line Link Here

(-)file_not_specified_in_diff (-14 / +18 lines)
0	-- configure.in	0	++ configure.in
Lines 118-125 Link Here
118	AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. 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\"]))	118	AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. 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\"]))
119	AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))	119	AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
120	AC_CHECK_LIB(alut, alutLoadWAVFile,	120	AC_CHECK_LIB(alut, alutLoadWAVFile,
121	LDFLAGS="$LDFLAGS -lalut",	121	LIBS="$LIBS -lalut", )
122	LDFLAGS="$LDFLAGS")
123		122
124	AC_CHECK_LIB(dl, dlopen)	123	AC_CHECK_LIB(dl, dlopen)
125	AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. 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\"]))	124	AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. 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\"]))
126	-- Make-default.mk	125	++ Make-default.mk
Lines 402-408 Link Here
402	ifdef PROGRAM	402	ifdef PROGRAM
403		403
404	${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})	404	${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
405	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@	405	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
406		406
407	installprogram: ${PROGRAM}	407	installprogram: ${PROGRAM}
408	@ createdir="${INSTLIBBASE}" ; \	408	@ createdir="${INSTLIBBASE}" ; \
Lines 420-433 Link Here
420	ifdef LOCALTOOLS	420	ifdef LOCALTOOLS
421		421
422	${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})	422	${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
423	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@	423	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
424		424
425	endif	425	endif
426		426
427	ifdef TOOLS	427	ifdef TOOLS
428		428
429	${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})	429	${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
430	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@	430	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
431		431
432	installtools: ${TOOLS}	432	installtools: ${TOOLS}
433	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \	433	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \
Lines 478-484 Link Here
478	ifdef SOLIBRARY	478	ifdef SOLIBRARY
479		479
480	${SOLIBRARY}: ${OBJECTS}	480	${SOLIBRARY}: ${OBJECTS}
481	${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS}	481	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
482	@D=`pwd` ; \	482	@D=`pwd` ; \
483	createdir="${EXPORTBASE}/lib" ; \	483	createdir="${EXPORTBASE}/lib" ; \
484	$(mkinstalldirs) $$createdir ; \	484	$(mkinstalldirs) $$createdir ; \
Lines 509-515 Link Here
509	ifdef MODULE	509	ifdef MODULE
510		510
511	${MODULE}: ${OBJECTS}	511	${MODULE}: ${OBJECTS}
512	${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS}	512	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
513	@D=`pwd` ; \	513	@D=`pwd` ; \
514	createdir="${EXPORTBASE}/${MODULEDIR}" ; \	514	createdir="${EXPORTBASE}/${MODULEDIR}" ; \
515	$(mkinstalldirs) $$createdir ; \	515	$(mkinstalldirs) $$createdir ; \
516	-- src/libs/client/Makefile	516	++ src/libs/client/Makefile
Lines 23-28 Link Here
23	SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \	23	SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
24	optionmenu.cpp	24	optionmenu.cpp
25		25
		26	SOLIBS = -lconfscreens -lraceengine
		27
26	LIBS = -lplibssg -lplibsg -lplibul	28	LIBS = -lplibssg -lplibsg -lplibul
27		29
28	EXPDIR = include	30	EXPDIR = include
29	-- src/libs/Makefile	31	++ src/libs/Makefile
Lines 23-29 Link Here
23		23
24	TOOLSUBDIRS = txml	24	TOOLSUBDIRS = txml
25		25
26	SUBDIRS = confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \	26	SUBDIRS = confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
27	portability math	27	portability math
28		28
29	PKGSUBDIRS = $(SUBDIRS)	29	PKGSUBDIRS = $(SUBDIRS)
30	-- src/libs/raceengineclient/Makefile	30	++ src/libs/raceengineclient/Makefile
Lines 23-28 Link Here
23	SOURCES = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \	23	SOURCES = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \
24	raceengine.cpp raceresults.cpp	24	raceengine.cpp raceresults.cpp
25		25
		26	SOLIBS = -lconfscreens -lrobottools -lracescreens
		27
26	EXPDIR = include	28	EXPDIR = include
27		29
28	EXPORTS = singleplayer.h raceinit.h	30	EXPORTS = singleplayer.h raceinit.h
29	-- src/libs/tgf/Makefile	31	++ src/libs/tgf/Makefile
Lines 29-34 Link Here
29	profiler.cpp \	29	profiler.cpp \
30	hash.cpp	30	hash.cpp
31		31
		32	SOLIBS = -ltxml
32		33
33	EXPDIR = include	34	EXPDIR = include
34		35