Permalink
Browse files

More merge? More merge.

  • Loading branch information...
Lirusaito committed May 3, 2016
1 parent 3242683 commit b4f0ea4c78c6dff81fbba1005d1f9fc20a296dfd
Showing with 10 additions and 16 deletions.
  1. +0 −2 indra/cmake/NVAPI.cmake
  2. +3 −0 indra/cmake/Variables.cmake
  3. +7 −0 indra/newview/CMakeLists.txt
  4. +0 −14 indra/newview/llappviewerwin32.cpp
View
@@ -2,8 +2,6 @@
include(Prebuilt)
include(Variables)
set(NVAPI ON CACHE BOOL "Use NVAPI.")
if (NVAPI)
if (WINDOWS)
use_prebuilt_binary(nvapi)
@@ -32,6 +32,9 @@ set(DISABLE_FATAL_WARNINGS TRUE CACHE BOOL "Set this to FALSE to enable fatal wa
option(INCREMENTAL_LINK "Use incremental linking or incremental LTCG for LTO on win32 builds (enable for faster links on some machines)" OFF)
option(USE_LTO "Enable Whole Program Optimization and related folding and binary reduction routines" OFF)
# Proprietary Library Features
option(NVAPI "Use nvapi driver interface library" OFF)
if(LIBS_CLOSED_DIR)
file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
else(LIBS_CLOSED_DIR)
@@ -1212,6 +1212,13 @@ if (WINDOWS)
llwindebug.h
)
if (NVAPI)
set(APPVWRW32_COMPILE_FLAGS "${APPVWRW32_COMPILE_FLAGS} -DUSE_NVAPI=1")
else (NVAPI)
set(APPVWRW32_COMPILE_FLAGS "${APPVWRW32_COMPILE_FLAGS} -UUSE_NVAPI")
endif (NVAPI)
set_source_files_properties(llappviewerwin32.cpp PROPERTIES COMPILE_FLAGS "${APPVWRW32_COMPILE_FLAGS}")
# precompiled header configuration
# llviewerprecompiledheaders.cpp generates
# the .pch file.
@@ -87,20 +87,6 @@ extern "C" {
const std::string LLAppViewerWin32::sWindowClass = "Second Life";
/*
This function is used to print to the command line a text message
describing the nvapi error and quits
*/
void nvapi_error(NvAPI_Status status)
{
NvAPI_ShortString szDesc = {0};
NvAPI_GetErrorMessage(status, szDesc);
LL_WARNS() << szDesc << LL_ENDL;
//should always trigger when asserts are enabled
//llassert(status == NVAPI_OK);
}
// Create app mutex creates a unique global windows object.
// If the object can be created it returns true, otherwise
// it returns false. The false result can be used to determine

0 comments on commit b4f0ea4

Please sign in to comment.