jessikitty/unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing example2 so it doesn't link against crnlib, bumping version strings/copyright messages.

Browse Source
This commit is contained in:
richgel99@gmail.com
2012-04-16 01:41:34 +00:00
parent 45901c935c
commit fffd983ffa
6 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crnlib/crn_core.cpp
+1 -1
View File
@@ -3,5 +3,5 @@
#include "crn_core.h" #include "crn_core.h"
#include "crn_winhdr.h" #include "crn_winhdr.h"
char *g_copyright_str = "Copyright (c) 2010-2012 Tenacious Software LLC"; char *g_copyright_str = "Copyright (c) 2010-2012 Rich Geldreich and Tenacious Software LLC";
char *g_sig_str = "C8cfRlaorj0wLtnMSxrBJxTC85rho2L9hUZKHcBL"; char *g_sig_str = "C8cfRlaorj0wLtnMSxrBJxTC85rho2L9hUZKHcBL";
example2/example2.2008.vcproj
-8
View File
@@ -67,7 +67,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)lib\VC9\$(ConfigurationName)\$(PlatformName)\crnlibD_VC9.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)D.exe" OutputFile="$(OutDir)\$(ProjectName)D.exe"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@@ -146,7 +145,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)lib\VC9\$(ConfigurationName)\$(PlatformName)\crnlibD_x64_VC9.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)D_x64.exe" OutputFile="$(OutDir)\$(ProjectName)D_x64.exe"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@@ -230,7 +228,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)lib\VC9\$(ConfigurationName)\$(PlatformName)\crnlib_VC9.lib&quot;"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
@@ -315,7 +312,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)lib\VC9\$(ConfigurationName)\$(PlatformName)\crnlib_x64_VC9.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)_x64.exe" OutputFile="$(OutDir)\$(ProjectName)_x64.exe"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@@ -397,7 +393,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)lib\VC9\$(ConfigurationName)\$(PlatformName)\crnlibD_DLL_VC9.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)D_DLL.exe" OutputFile="$(OutDir)\$(ProjectName)D_DLL.exe"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@@ -476,7 +471,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)lib\VC9\$(ConfigurationName)\$(PlatformName)\crnlibD_DLL_x64_VC9.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)D_DLL_x64.exe" OutputFile="$(OutDir)\$(ProjectName)D_DLL_x64.exe"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@@ -560,7 +554,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)lib\VC9\$(ConfigurationName)\$(PlatformName)\crnlib_DLL_VC9.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)_DLL.exe" OutputFile="$(OutDir)\$(ProjectName)_DLL.exe"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@@ -646,7 +639,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="&quot;$(SolutionDir)lib\VC9\$(ConfigurationName)\$(PlatformName)\crnlib_DLL_x64_VC9.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)_DLL_x64.exe" OutputFile="$(OutDir)\$(ProjectName)_DLL_x64.exe"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
inc/crn_decomp.h
+5 -4
View File
@@ -1,5 +1,5 @@
// File: crn_decomp.h - CRN texture decompressor v1.00 // File: crn_decomp.h - CRN texture decompressor v1.01
// Copyright (c) 2010-2011 Tenacious Software LLC // Copyright (c) 2010-2012 Rich Geldreich and Tenacious Software LLC
// //
// This single header file contains *all* of the code necessary to unpack .CRN files to raw DXTn bits. // This single header file contains *all* of the code necessary to unpack .CRN files to raw DXTn bits.
// It does NOT depend on the crn compression library. // It does NOT depend on the crn compression library.
@@ -17,7 +17,8 @@
// Include crnlib header - only to bring in some basic some CRN-related types. // Include crnlib header - only to bring in some basic some CRN-related types.
#include "crnlib.h" #include "crnlib.h"
#define CRND_VERSION_STRING "00.96" #define CRND_LIB_VERSION 101
#define CRND_VERSION_STRING "01.01"
#ifdef _DEBUG #ifdef _DEBUG
#define CRND_BUILD_DEBUG #define CRND_BUILD_DEBUG
@@ -4826,7 +4827,7 @@ namespace crnd
// crn_decomp.h uses the ZLIB license: // crn_decomp.h uses the ZLIB license:
// http://opensource.org/licenses/Zlib // http://opensource.org/licenses/Zlib
// //
// Copyright (c) 2010-2011 Tenacious Software LLC // Copyright (c) 2010-2012 Rich Geldreich and Tenacious Software LLC
// //
// This software is provided 'as-is', without any express or implied // This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages // warranty. In no event will the authors be held liable for any damages
inc/crnlib.h
+3 -3
View File
@@ -1,5 +1,5 @@
// File: crnlib.h - Advanced DXTn texture compression library. // File: crnlib.h - Advanced DXTn texture compression library.
// Copyright (c) 2010-2011 Tenacious Software LLC // Copyright (c) 2010-2012 Rich Geldreich and Tenacious Software LLC
// See copyright notice and license at the end of this file. // See copyright notice and license at the end of this file.
// //
// This header file contains the public crnlib declarations for DXTn and // This header file contains the public crnlib declarations for DXTn and
@@ -13,7 +13,7 @@
#ifndef CRNLIB_H #ifndef CRNLIB_H
#define CRNLIB_H #define CRNLIB_H
#define CRNLIB_VERSION 100 #define CRNLIB_VERSION 101
typedef unsigned char crn_uint8; typedef unsigned char crn_uint8;
typedef unsigned short crn_uint16; typedef unsigned short crn_uint16;
@@ -529,7 +529,7 @@ void crn_free_block_compressor(crn_block_compressor_context_t pContext);
// crnlib uses the ZLIB license: // crnlib uses the ZLIB license:
// http://opensource.org/licenses/Zlib // http://opensource.org/licenses/Zlib
// //
// Copyright (c) 2010-2011 Tenacious Software LLC // Copyright (c) 2010-2012 Rich Geldreich and Tenacious Software LLC
// //
// This software is provided 'as-is', without any express or implied // This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages // warranty. In no event will the authors be held liable for any damages
license.txt
+1 -1
View File
@@ -1,7 +1,7 @@
crunch/crnlib uses the ZLIB license: crunch/crnlib uses the ZLIB license:
http://opensource.org/licenses/Zlib http://opensource.org/licenses/Zlib
Copyright (c) 2010-2011 Tenacious Software LLC Copyright (c) 2010-2012 Rich Geldreich and Tenacious Software LLC
This software is provided 'as-is', without any express or implied This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages warranty. In no event will the authors be held liable for any damages
readme.txt
+2 -2
View File
@@ -1,5 +1,5 @@
crunch/crnlib v1.00 - Advanced DXTn texture compression library crunch/crnlib v1.01 - Advanced DXTn texture compression library
Copyright (C) 2010-2011 Tenacious Software LLC Copyright (C) 2010-2012 Rich Geldreich and Tenacious Software LLC
For bugs or support contact Rich Geldreich <richgel99@gmail.com>. For bugs or support contact Rich Geldreich <richgel99@gmail.com>.