Browse Source

Update version number.

pull/331/head
Ignacio Castano 8 months ago
parent
commit
b4da3c68f0
9 changed files with 37 additions and 24 deletions
  1. +1
    -0
      .gitignore
  2. +2
    -2
      CMakeLists.txt
  3. +1
    -1
      VERSION
  4. +0
    -10
      buildpkg
  5. +1
    -0
      doc/release_todo
  6. +23
    -0
      project/vc2017/buildpkg.bat
  7. +7
    -9
      project/vc2017/nvtt/nvtt.rc
  8. +1
    -1
      src/nvtt/nvtt.h
  9. +1
    -1
      src/nvtt/nvtt_wrapper.h

+ 1
- 0
.gitignore View File

@ -14,3 +14,4 @@
*.suo
build
.vs
project/nvtt.sublime-workspace

+ 2
- 2
CMakeLists.txt View File

@ -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 <castano@gmail.com>")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Texture processing tools with support for Direct3D 10 and 11 formats.")


+ 1
- 1
VERSION View File

@ -1 +1 @@
2.1.1
2.1.2

+ 0
- 10
buildpkg View File

@ -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' *

+ 1
- 0
doc/release_todo View File

@ -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
- 0
project/vc2017/buildpkg.bat View File

@ -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

+ 7
- 9
project/vc2017/nvtt/nvtt.rc View File

@ -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
/////////////////////////////////////////////////////////////////////////////


+ 1
- 1
src/nvtt/nvtt.h View File

@ -49,7 +49,7 @@
# define NVTT_API
#endif
#define NVTT_VERSION 20101
#define NVTT_VERSION 20102
#define NVTT_FORBID_COPY(Class) \
private: \


+ 1
- 1
src/nvtt/nvtt_wrapper.h View File

@ -48,7 +48,7 @@
# define NVTT_API
#endif
#define NVTT_VERSION 20101
#define NVTT_VERSION 20102
#ifdef __cplusplus
typedef struct nvtt::InputOptions NvttInputOptions;


Loading…
Cancel
Save