From 128503fd7fc09da60c02970d3a1602ad307d27d6 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Sun, 6 Oct 2013 22:54:38 -0400 Subject: [PATCH 1/6] Attempt to fix linking issues --- indra/cmake/Linking.cmake | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 00754ec36..d3ccca416 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -5,22 +5,29 @@ set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") include(Variables) if (NOT STANDALONE) - if (WINDOWS) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib) - set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) - set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - elseif (LINUX) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) - set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS}) - set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS}) - elseif (DARWIN) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib) - set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) - set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - endif (WINDOWS) + set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib) + set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) + set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) + + if(WINDOWS OR DARWIN) + # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us + # fortunately both windows and darwin are case insensitive filesystems so this works. + set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}") + else(WINDOWS OR DARWIN) + # else block is for linux and any other makefile based generators + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) + set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER}) + endif(WINDOWS OR DARWIN) + + if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") + # When we're building something other than Release, append the + # packages/lib/release directory to deal with autobuild packages that don't + # provide (e.g.) lib/debug libraries. + list(APPEND ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) + endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") endif (NOT STANDALONE) -link_directories(${ARCH_PREBUILT_DIRS}) +link_directories(${ARCH_PREBUILT_LINK_DIRS}) if (LINUX) set(DL_LIBRARY dl) From 817c01595f0d5a74a22f45a6f95ee6b25c255b33 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Sun, 6 Oct 2013 22:55:21 -0400 Subject: [PATCH 2/6] I really really hate you microsoft. More windows sdk cmake poke --- indra/cmake/DirectX.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index a0dc4b2b5..97a0bf910 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -44,10 +44,15 @@ if (WINDOWS) "$ENV{ProgramFiles(x86)}/Windows Kits/8.0" ) - if (WIN_KIT_ROOT_DIR) + find_path (WIN_KIT_LIB_DIR dxguid.lib + "${WIN_KIT_ROOT_DIR}/Lib/winv6.3/um/${DIRECTX_ARCHITECTURE}" + "${WIN_KIT_ROOT_DIR}/Lib/Win8/um/${DIRECTX_ARCHITECTURE}" + ) + + if (WIN_KIT_ROOT_DIR AND WIN_KIT_LIB_DIR) set (DIRECTX_INCLUDE_DIR "${WIN_KIT_ROOT_DIR}/Include/um" "${WIN_KIT_ROOT_DIR}/Include/shared") - set (DIRECTX_LIBRARY_DIR "${WIN_KIT_ROOT_DIR}/Lib/Win8/um/${DIRECTX_ARCHITECTURE}") - endif (WIN_KIT_ROOT_DIR) + set (DIRECTX_LIBRARY_DIR "${WIN_KIT_LIB_DIR}") + endif (WIN_KIT_ROOT_DIR AND WIN_KIT_LIB_DIR) endif (DIRECTX_ROOT_DIR) if (DIRECTX_INCLUDE_DIR) From a1751dcc1e716c60b21b4f371d9baa6e48cf1c5c Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Sun, 6 Oct 2013 22:55:30 -0400 Subject: [PATCH 3/6] Warning fix --- indra/newview/lldrawpoolalpha.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 5fdedc68e..28bc74a47 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -335,7 +335,7 @@ void LLDrawPoolAlpha::render(S32 pass) gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); } - gGL.diffuseColor4f(0.9,0,0,0.4); + gGL.diffuseColor4f(0.9f,0.f,0.f,0.4f); LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f*1024.f); gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep, TRUE) ; From 610f7ac5de6463888d8ebd245752c0f3eb1dd5a1 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Mon, 7 Oct 2013 23:23:40 -0400 Subject: [PATCH 4/6] Fix a Clang error --- indra/newview/llviewerwearable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index bdd03c0eb..30483c738 100644 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -698,7 +698,7 @@ std::ostream& operator<<(std::ostream &s, const LLViewerWearable &w) //w.mSaleInfo s << " Params:" << "\n"; - for (LLWearable::visual_param_index_map_t::const_iterator iter = w.mVisualParamIndexMap.begin(); + for (LLViewerWearable::visual_param_index_map_t::const_iterator iter = w.mVisualParamIndexMap.begin(); iter != w.mVisualParamIndexMap.end(); ++iter) { S32 param_id = iter->first; From a4fa66655e4ae7d82932a74550371407eb7b1132 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Mon, 7 Oct 2013 23:23:51 -0400 Subject: [PATCH 5/6] Unbreak OSX Make File builds --- indra/cmake/Linking.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index d3ccca416..9f777827e 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -9,15 +9,15 @@ if (NOT STANDALONE) set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - if(WINDOWS OR DARWIN) + if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us # fortunately both windows and darwin are case insensitive filesystems so this works. set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}") - else(WINDOWS OR DARWIN) + else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) # else block is for linux and any other makefile based generators string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER}) - endif(WINDOWS OR DARWIN) + endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") # When we're building something other than Release, append the From e1356b7aaf7852c60893f4c664b386e20bbeb803 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Sun, 3 Nov 2013 23:00:56 -0500 Subject: [PATCH 6/6] Fix slight breakage in the osx cmake --- indra/cmake/Linking.cmake | 6 +++--- indra/cmake/Variables.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 9f777827e..e7bc897c9 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -9,15 +9,15 @@ if (NOT STANDALONE) set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) + if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us # fortunately both windows and darwin are case insensitive filesystems so this works. set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}") - else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) + else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") # else block is for linux and any other makefile based generators string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER}) - endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) + endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") # When we're building something other than Release, append the diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 70d025d85..187412b4a 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -97,7 +97,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - if(${CMAKE_GENERATOR} MATCHES Xcode) + if(${CMAKE_GENERATOR} MATCHES "Xcode") #SDK Compiler and Deployment targets for XCode if (${XCODE_VERSION} VERSION_LESS 4.0.0) set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) @@ -106,10 +106,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) endif (${XCODE_VERSION} VERSION_LESS 4.0.0) - else(${CMAKE_GENERATOR} MATCHES Xcode) + else(${CMAKE_GENERATOR} MATCHES "Xcode") set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) - endif(${CMAKE_GENERATOR} MATCHES Xcode) + endif(${CMAKE_GENERATOR} MATCHES "Xcode") set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")