Skip to content
This repository has been archived by the owner on Dec 31, 2020. It is now read-only.

Commit

Permalink
Update version number.
Browse files Browse the repository at this point in the history
  • Loading branch information
castano committed Aug 24, 2020
1 parent 46d1179 commit b4da3c6
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 24 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
*.suo
build
.vs
project/nvtt.sublime-workspace
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Texture processing tools with support for Direct3D 10 and 11 formats.")

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.1
2.1.2
10 changes: 0 additions & 10 deletions buildpkg

This file was deleted.

1 change: 1 addition & 0 deletions doc/release_todo
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 23 additions & 0 deletions project/vc2017/buildpkg.bat
Original file line number Diff line number Diff line change
@@ -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
16 changes: 7 additions & 9 deletions project/vc2017/nvtt/nvtt.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
/////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -85,7 +83,7 @@ BEGIN
END
END

#endif // English (U.S.) resources
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////


Expand Down
2 changes: 1 addition & 1 deletion src/nvtt/nvtt.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
# define NVTT_API
#endif

#define NVTT_VERSION 20101
#define NVTT_VERSION 20102

#define NVTT_FORBID_COPY(Class) \
private: \
Expand Down
2 changes: 1 addition & 1 deletion src/nvtt/nvtt_wrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# define NVTT_API
#endif

#define NVTT_VERSION 20101
#define NVTT_VERSION 20102

#ifdef __cplusplus
typedef struct nvtt::InputOptions NvttInputOptions;
Expand Down

0 comments on commit b4da3c6

Please sign in to comment.