diff --git a/cmake/OptimalOptions.cmake b/cmake/OptimalOptions.cmake index 50aa865..1a8f389 100644 --- a/cmake/OptimalOptions.cmake +++ b/cmake/OptimalOptions.cmake @@ -9,9 +9,10 @@ IF(CMAKE_COMPILER_IS_GNUCXX) ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "i586") IF(NV_SYSTEM_PROCESSOR STREQUAL "i686") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i686") + #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i686") #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse -mtune=i686 -msse3") #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium4") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=prescott") ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "i686") IF(NV_SYSTEM_PROCESSOR STREQUAL "x86_64") diff --git a/configure b/configure index 8c7876d..5892f52 100755 --- a/configure +++ b/configure @@ -53,7 +53,7 @@ echo "-- Configuring nvidia-texture-tools "`cat VERSION` mkdir -p ./build cd ./build -$CMAKE .. -DCMAKE_BUILD_TYPE=$build -DCMAKE_INSTALL_PREFIX=$prefix -G "Unix Makefiles" || exit 1 +$CMAKE .. -DNVTT_SHARED=1 -DCMAKE_BUILD_TYPE=$build -DCMAKE_INSTALL_PREFIX=$prefix -G "Unix Makefiles" || exit 1 cd .. echo "" diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt index d34cb15..e1905f0 100644 --- a/src/nvtt/CMakeLists.txt +++ b/src/nvtt/CMakeLists.txt @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEFINITIONS(-DNVTT_EXPORTS) IF(NVTT_SHARED) - ADD_LIBRARY(nvtt SHARED ${DXT_SRCS}) + ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS}) ELSE(NVTT_SHARED) ADD_LIBRARY(nvtt ${NVTT_SRCS}) ENDIF(NVTT_SHARED)