From 6d8a75462a8874b5e46351d3b65cd2bf2374ffe3 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Thu, 16 Oct 2008 22:22:45 +0000
Subject: [PATCH] Build nvtt as a shared library.

---
 cmake/OptimalOptions.cmake | 3 ++-
 configure                  | 2 +-
 src/nvtt/CMakeLists.txt    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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)