liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New CMAKE bundle option

Browse Source 
on behalf of L.Jirkovsky, see issue 184
This commit is contained in:
Oliver Duis
2011-07-08 17:53:29 +02:00
parent 76c0aae328
commit e0a273904a
6 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/splash.cc
View File

@@ -21,11 +21,9 @@
#include <glib/gstdio.h>
#include <safegtk.h>
#ifndef WIN32
#include <config.h>
#endif
extern Glib::ustring argv0;
extern Glib::ustring creditsPath;
extern Glib::ustring licensePath;
extern Glib::ustring versionString;
SplashImage::SplashImage () {
@@ -86,11 +84,7 @@ Splash::Splash () {
splashImage->show ();
// Tab 2: the informations about the current version
#if defined WIN32 || defined __APPLE__
std::string buildFileName = Glib::build_filename (argv0, "AboutThisBuild.txt");
#else
std::string buildFileName = Glib::build_filename (CREDITS_SEARCH_PATH, "AboutThisBuild.txt");
#endif
std::string buildFileName = Glib::build_filename (creditsPath, "AboutThisBuild.txt");
if ( safe_file_test(buildFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (buildFileName, "rt");
if (f != NULL) {
@@ -113,11 +107,7 @@ Splash::Splash () {
}
// Tab 3: the credits
#if defined WIN32 || defined __APPLE__
std::string creditsFileName = Glib::build_filename (argv0, "AUTHORS.txt");
#else
std::string creditsFileName = Glib::build_filename (CREDITS_SEARCH_PATH, "AUTHORS.txt");
#endif
std::string creditsFileName = Glib::build_filename (creditsPath, "AUTHORS.txt");
if ( safe_file_test(creditsFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (creditsFileName, "rt");
if (f != NULL) {
@@ -140,11 +130,7 @@ Splash::Splash () {
}
// Tab 4: the license
#if defined WIN32 || defined __APPLE__
std::string licenseFileName = Glib::build_filename (argv0, "LICENSE.txt");
#else
std::string licenseFileName = Glib::build_filename (LICENCE_SEARCH_PATH, "LICENSE.txt");
#endif
std::string licenseFileName = Glib::build_filename (licensePath, "LICENSE.txt");
if ( safe_file_test(licenseFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (licenseFileName, "rt");
if (f != NULL) {