Merge changes from private tree.
Eliminate files that are not needed for NVTT.
This commit is contained in:
@ -5,11 +5,18 @@ SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
|
||||
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
|
||||
|
||||
IF(WIN32)
|
||||
SET(GNUWIN32 "${NV_SOURCE_DIR}/extern/gnuwin32")
|
||||
SET(CMAKE_INCLUDE_PATH "${GNUWIN32}/include")
|
||||
SET(CMAKE_LIBRARY_PATH "${GNUWIN32}/lib")
|
||||
# gnuwin32 paths:
|
||||
SET(GNUWIN32_PATH "${NV_SOURCE_DIR}/extern/gnuwin")
|
||||
SET(CMAKE_INCLUDE_PATH "${GNUWIN32_PATH}/include")
|
||||
IF (NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
|
||||
SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${GNUWIN32_PATH}/lib/win64")
|
||||
ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
|
||||
SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${GNUWIN32_PATH}/lib/win32")
|
||||
ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
|
||||
|
||||
# Set GLUT path:
|
||||
SET(GLUT_ROOT_PATH "${NV_SOURCE_DIR}/extern/glut")
|
||||
|
||||
ENDIF(WIN32)
|
||||
|
||||
INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
|
||||
@ -23,9 +30,6 @@ IF(NVTT_SHARED)
|
||||
SET(NVIMAGE_SHARED TRUE)
|
||||
ENDIF(NVTT_SHARED)
|
||||
|
||||
ADD_SUBDIRECTORY(extern)
|
||||
|
||||
ADD_SUBDIRECTORY(src)
|
||||
|
||||
IF(WIN32)
|
||||
ADD_SUBDIRECTORY(extern/gnuwin32)
|
||||
ENDIF(WIN32)
|
||||
|
Reference in New Issue
Block a user