diff --git a/.gitignore b/.gitignore index e336abe..1133c39 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ *.suo build .vs +project/nvtt.sublime-workspace diff --git a/CMakeLists.txt b/CMakeLists.txt index 37ea653..668cd7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,8 +44,8 @@ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") SET(CPACK_PACKAGE_NAME "nvidia-texture-tools") SET(CPACK_PACKAGE_VERSION_MAJOR "2") SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "1") -SET(CPACK_PACKAGE_VERSION "2.1.1") +SET(CPACK_PACKAGE_VERSION_PATCH "2") +SET(CPACK_PACKAGE_VERSION "2.1.2") SET(CPACK_PACKAGE_CONTACT "Ignacio Castaņo ") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Texture processing tools with support for Direct3D 10 and 11 formats.") diff --git a/VERSION b/VERSION index 3e3c2f1..eca07e4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.1 +2.1.2 diff --git a/buildpkg b/buildpkg deleted file mode 100755 index 2969cd3..0000000 --- a/buildpkg +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -tar zcvf nvidia-texture-tools-`cat VERSION`.tar.gz \ - --exclude '.*' --exclude debian --exclude '*~' --exclude buildpkg \ - --exclude 'build-*' --exclude data --exclude tags --exclude Makefile \ - --exclude 'doc' --exclude 'nvidia-texture-tools-*.tar.gz' \ - --exclude '*.user' -s ',^,nvidia-texture-tools/,' * -# --exclude '*.user' --transform 's,^,nvidia-texture-tools/,' * -# --exclude '*.user' * - diff --git a/doc/release_todo b/doc/release_todo index c3927f7..e13c2bf 100644 --- a/doc/release_todo +++ b/doc/release_todo @@ -2,3 +2,4 @@ Update version number in nvtt/nvtt.h Update version number in nvimage/DirectDrawSurface.cpp Update version number in CMakeLists.txt Update version number in VERSION +Update version number in project/vc2017/nvtt/nvtt.rc diff --git a/project/vc2017/buildpkg.bat b/project/vc2017/buildpkg.bat new file mode 100644 index 0000000..33a7288 --- /dev/null +++ b/project/vc2017/buildpkg.bat @@ -0,0 +1,23 @@ + +mkdir dist + +mkdir dist\lib +mkdir dist\lib64 +mkdir dist\bin +mkdir dist\bin64 +mkdir dist\include +mkdir dist\include\nvtt + +copy Release.Win32\bin\nvcompress.exe dist\bin +copy Release.Win32\bin\nvdecompress.exe dist\bin +copy Release.Win32\bin\nvtt.dll dist\bin +copy Release.Win32\bin\nvtt.pdb dist\bin +copy Release.Win32\lib\nvtt.lib dist\lib + +copy Release.x64\bin\nvcompress.exe dist\bin64 +copy Release.x64\bin\nvdecompress.exe dist\bin64 +copy Release.x64\bin\nvtt.dll dist\bin64 +copy Release.x64\bin\nvtt.pdb dist\bin64 +copy Release.x64\lib\nvtt.lib dist\lib64 + +copy Release.Win32\include\nvtt\nvtt.h dist\include\nvtt\nvtt.h diff --git a/project/vc2017/nvtt/nvtt.rc b/project/vc2017/nvtt/nvtt.rc index 53ec9d1..2ae6ec7 100644 --- a/project/vc2017/nvtt/nvtt.rc +++ b/project/vc2017/nvtt/nvtt.rc @@ -7,19 +7,17 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "windows.h" +#include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -53,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,0,0 - PRODUCTVERSION 2,1,0,0 + FILEVERSION 2,1,2,0 + PRODUCTVERSION 2,1,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -71,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "NVIDIA Corporation" VALUE "FileDescription", "NVIDIA Texture Tools Dynamic Link Library" - VALUE "FileVersion", "2, 1, 0, 0" + VALUE "FileVersion", "2.1.2.0" VALUE "InternalName", "nvtt" VALUE "LegalCopyright", "Copyright (C) 2007" VALUE "OriginalFilename", "nvtt.dll" VALUE "ProductName", "NVIDIA Texture Tools Dynamic Link Library" - VALUE "ProductVersion", "2, 1, 0, 0" + VALUE "ProductVersion", "2.1.2.0" END END BLOCK "VarFileInfo" @@ -85,7 +83,7 @@ BEGIN END END -#endif // English (U.S.) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/nvtt/nvtt.h b/src/nvtt/nvtt.h index 111e151..0820092 100644 --- a/src/nvtt/nvtt.h +++ b/src/nvtt/nvtt.h @@ -49,7 +49,7 @@ # define NVTT_API #endif -#define NVTT_VERSION 20101 +#define NVTT_VERSION 20102 #define NVTT_FORBID_COPY(Class) \ private: \ diff --git a/src/nvtt/nvtt_wrapper.h b/src/nvtt/nvtt_wrapper.h index 80f7b71..add4d7a 100644 --- a/src/nvtt/nvtt_wrapper.h +++ b/src/nvtt/nvtt_wrapper.h @@ -48,7 +48,7 @@ # define NVTT_API #endif -#define NVTT_VERSION 20101 +#define NVTT_VERSION 20102 #ifdef __cplusplus typedef struct nvtt::InputOptions NvttInputOptions;