[Scummvm-cvs-logs] scummvm-tools master -> 9e3a0ccb464cb2505140159aa484cbd6a0b627b6

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
a193787888 BUILD: Allow building with CC compiler on solaris
9e3a0ccb46 TOOLS: Fix use of wxT macro


Commit: a19378788898a31ea179c5cfc8211789abfb3c93
    https://github.com/scummvm/scummvm-tools/commit/a19378788898a31ea179c5cfc8211789abfb3c93
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2013-06-29T18:10:09-07:00

Commit Message:
BUILD: Allow building with CC compiler on solaris

Patch provided by Laurent Blume (see bug #3614504).

Changed paths:
    configure



diff --git a/configure b/configure
index f3ed95c..38712a1 100755
--- a/configure
+++ b/configure
@@ -752,7 +752,7 @@ else
 	if test -n "$_host"; then
 		compilers="$_host_alias-g++ $_host_alias-c++ $_host-g++ $_host-c++"
 	else
-		compilers="g++ c++"
+		compilers="g++ c++ CC"
 	fi
 
 	# Iterate over all candidates, pick the first working one
@@ -812,11 +812,9 @@ else
 			cxx_version="not found"
 			cxx_verc_fail=yes
 		fi
-		echo non-gcc compiler version ${cxx_version}
 	else
 		cxx_version="not found"
 		cxx_verc_fail=yes
-		echo found non-gcc compiler version ${cxx_version}
 	fi
 
 	case $_host_os in
@@ -836,6 +834,20 @@ else
 					;;
 			esac
 			;;
+		solaris*)
+			cxx_version=`( $CXX -V ) 2>&1`
+			cxx_version="`echo "${cxx_version}" | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`"
+			
+			case $cxx_version in
+				5.1[0-2])
+					cxx_verc_fail=no
+					;;
+				*)
+					cxx_version="$cxx_version, bad"
+					cxx_verc_fail=yes
+					;;
+			esac
+			;;
 		*)
 			cxx_version="$cxx_version, bad"
 			cxx_verc_fail=yes
@@ -850,6 +862,8 @@ if test "$cxx_verc_fail" = yes ; then
 	echo "The version of your compiler is not supported at this time"
 	echo "Please ensure you are using GCC >= 2.95"
 	exit 1
+else
+	echo found non-gcc compiler version ${cxx_version}
 fi
 
 #


Commit: 9e3a0ccb464cb2505140159aa484cbd6a0b627b6
    https://github.com/scummvm/scummvm-tools/commit/9e3a0ccb464cb2505140159aa484cbd6a0b627b6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2013-06-29T18:11:41-07:00

Commit Message:
TOOLS: Fix use of wxT macro

This fixes compilation with solaris CC compiler.
Patch provided by Laurent Blume (see bug #3614504).

Changed paths:
    gui/pages.cpp



diff --git a/gui/pages.cpp b/gui/pages.cpp
index d116ea7..c6660d5 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -848,10 +848,10 @@ void ChooseAudioFormatPage::onNext(wxWindow *panel) {
 		) {
 			wxMessageDialog *msgDialog = new wxMessageDialog(
 					NULL,
-					wxT("The lame executable could not be found. It is needed to compress files to MP3. "
-						"You can either proceed to the advanced audio settings page and give the path to lame "
-						"or you can select another audio format to compress to.\n\n"
-						"Do you want to proceed to the advanced audio settings page?"),
+					wxT("The lame executable could not be found. It is needed to compress files to MP3. ")
+						wxT("You can either proceed to the advanced audio settings page and give the path to lame ")
+						wxT("or you can select another audio format to compress to.\n\n")
+						wxT("Do you want to proceed to the advanced audio settings page?"),
 					wxT("lame not found"),
 					wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION
 				);
@@ -1050,9 +1050,9 @@ void ChooseAudioOptionsMp3Page::onNext(wxWindow *panel) {
 	if (!Configuration::isLamePathValid(lamePath->GetPath())) {
 		wxMessageDialog *msgDialog = new wxMessageDialog(
 				NULL,
-				wxT("The lame executable could not be found. It is needed to compress files to MP3. "
-				    "If you want to use MP3 compression you need to select a valid lame executable. "
-					"Otherwise you can go back to the audio format selection and select another format."),
+				wxT("The lame executable could not be found. It is needed to compress files to MP3. ")
+					wxT("If you want to use MP3 compression you need to select a valid lame executable. ")
+					wxT("Otherwise you can go back to the audio format selection and select another format."),
 				wxT("lame not found"),
 				wxOK | wxICON_EXCLAMATION
 			);