Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 9595 → Rev 9596

/branches/Version135x/Scribus/scribus/scpaths.cpp
12,7 → 12,7
 
// On Qt/Mac we need CoreFoundation to discover the location
// of the app bundle.
#ifdef BUILD_MAC_BUNDLE
#ifdef Q_WS_MAC
#include <CoreFoundation/CoreFoundation.h>
#endif
 
60,7 → 60,7
{
// On MacOS/X, override the compile-time settings with a location
// obtained from the system.
#ifdef BUILD_MAC_BUNDLE
#ifdef Q_WS_MAC
// Set up the various app paths to look inside the app bundle
CFURLRef pluginRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
CFStringRef macPath = CFURLCopyFileSystemPath(pluginRef,
/branches/Version135x/Scribus/CMakeLists.txt
51,7 → 51,11
#On Apple, we ignore the versioning tag so all items are "scribus" not "scribus-version"
 
IF (NOT BUILD_OSX_BUNDLE)
SET(BUILD_OSX_BUNDLE FALSE CACHE TYPE BOOL)
IF (APPLE)
SET(BUILD_OSX_BUNDLE TRUE CACHE TYPE BOOL)
ELSE (APPLE)
SET(BUILD_OSX_BUNDLE FALSE CACHE TYPE BOOL)
ENDIF (APPLE)
ENDIF (NOT BUILD_OSX_BUNDLE)
 
127,7 → 131,7
SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
SET(CMAKE_CXX_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions -Wall")
SET(CMAKE_C_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions -Wall")
SET(BUILD_MAC_BUNDLE 1)
# SET(BUILD_MAC_BUNDLE 1)
ELSE(APPLE)
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -Wall -fstrict-aliasing")
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -Wall -fstrict-aliasing")