Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Further OS X changes."

Browse Source 
This reverts commit 803011582c.
This commit is contained in:
Drake Arconis
2012-02-22 05:49:38 -05:00
parent 3250725aae
commit edbc22961e
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/cmake/Variables.cmake
View File

@@ -78,15 +78,15 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
#SDK Compiler and Deployment targets for XCode #SDK Compiler and Deployment targets for XCode
if (${XCODE_VERSION} VERSION_LESS 4.0.0) if (${XCODE_VERSION} VERSION_LESS 4.0.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2") set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
else (${XCODE_VERSION} VERSION_LESS 4.0.0) else (${XCODE_VERSION} VERSION_LESS 4.0.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
endif (${XCODE_VERSION} VERSION_LESS 4.0.0) endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
# NOTE: To attempt an i386/PPC Universal build, add this on the configure line: # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
# -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
# Build only for i386 by default, system default on MacOSX 10.6 is x86_64 # Build only for i386 by default, system default on MacOSX 10.6 is x86_64

55
indra/newview/CMakeLists.txt
View File

@@ -1338,40 +1338,39 @@ if (OPENAL)
endif (OPENAL) endif (OPENAL)
if (FMOD OR FMODEX) if (FMOD OR FMODEX)
if (FMODEX) if(FMODEX)
set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODEX") set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODEX")
endif (FMODEX) endif(FMODEX)
if (FMOD) if(FMOD)
set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMOD") set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMOD")
endif (FMOD) endif(FMOD)
if (DARWIN) if (NOT WINDOWS)
set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp) set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES}) add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
if (FMODEX) if(FMOD AND FMODEX)
set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY} ${CARBON_LIBRARY}) set(fmodwrapper_needed_LIBRARIES "${FMODEX_LIBRARY} ${FMOD_LIBRARY}")
endif (FMODEX) else(FMOD AND FMODEX)
if (FMOD) if(FMODEX)
set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY}) set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY})
endif (FMOD) endif(FMODEX)
set_target_properties( if(FMOD)
fmodwrapper set(fmodwrapper_needed_LIBRARIES "${FMOD_LIBRARY}")
PROPERTIES endif(FMOD)
BUILD_WITH_INSTALL_RPATH 1 endif(FMOD AND FMODEX)
INSTALL_NAME_DIR "@executable_path/../Resources" if (DARWIN)
LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp" list(APPEND fmodwrapper_needed_LIBRARIES ${CARBON_LIBRARY})
) set_target_properties(
fmodwrapper
PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path/../Resources"
LINK_FLAGS "-unexported_symbols_list \"${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp\""
)
endif (DARWIN)
set(FMODWRAPPER_LIBRARY fmodwrapper) set(FMODWRAPPER_LIBRARY fmodwrapper)
target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES}) target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
else (DARWIN) endif (NOT WINDOWS)
# fmodwrapper unnecessary on linux or windows, for fmod and fmodex
if (FMODEX)
set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY})
endif (FMODEX)
if (FMOD)
set(FMODWRAPPER_LIBRARY ${FMOD_LIBRARY})
endif (FMOD)
endif (DARWIN)
endif (FMOD OR FMODEX) endif (FMOD OR FMODEX)
set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}") set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")