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

Build fixes

Browse Source
This commit is contained in:
Siana Gearz
2011-05-11 23:06:49 +02:00
parent 29feeccf0d
commit b3847fdeed
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llplugin/CMakeLists.txt
View File

@@ -52,13 +52,13 @@ set(llplugin_HEADER_FILES
set_source_files_properties(${llplugin_HEADER_FILES} set_source_files_properties(${llplugin_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE) PROPERTIES HEADER_FILE_ONLY TRUE)
if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)
endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4) endif (NOT WORD_SIZE EQUAL 32)
list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES}) list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})

4
indra/media_plugins/base/CMakeLists.txt
View File

@@ -25,13 +25,13 @@ include_directories(
### media_plugin_base ### media_plugin_base
if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)
endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4) endif (NOT WORD_SIZE EQUAL 32)
set(media_plugin_base_SOURCE_FILES set(media_plugin_base_SOURCE_FILES
media_plugin_base.cpp media_plugin_base.cpp

8
indra/newview/CMakeLists.txt
View File

@@ -1330,11 +1330,11 @@ set(PACKAGE ${PACKAGE_DEFAULT} CACHE BOOL
"Add a package target that builds an installer package.") "Add a package target that builds an installer package.")
if (WINDOWS) if (WINDOWS)
if(MSVC71) if(MSVC10)
set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES") set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map")
else(MSVC71) else()
set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map") set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
endif(MSVC71) endif()
set_target_properties(${VIEWER_BINARY_NAME} set_target_properties(${VIEWER_BINARY_NAME}
PROPERTIES PROPERTIES