Skip to content

GitLab

Commit d44381f7 authored by Phillip Castaneda's avatar Phillip Castaneda
Browse files

Adding FileVersion & ProductVersion Info to release dll 

Upping version to 1.4.0
parent a2ecfee9
Show whitespace changes
Inline Side-by-side
Showing with 258 additions and 104 deletions
OIS.pc.in
View file @ d44381f7
......@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
Name: OIS
Description: Crossplatform C++ Input Framework
Description: Cross platform C++ Input Framework
Version: @VERSION@
Libs: -L${libdir} -lOIS
Cflags: -I${includedir}/@PACKAGE@ -I${includedir}
......
Win32/OIS.rc 0 → 100644
View file @ d44381f7
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) 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
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,0,0
PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OIS Library"
VALUE "FileVersion", "1.4.0.0"
VALUE "InternalName", "OIS"
VALUE "LegalCopyright", "Copyright (C) 2010"
VALUE "OriginalFilename", "OIS.dll"
VALUE "ProductName", "OIS Library"
VALUE "ProductVersion", "1.4.0.0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
Win32/OIS_vc9.vcproj
View file @ d44381f7
......@@ -91,9 +91,9 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="..\lib64\"
IntermediateDirectory="..\lib64\obj\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="..\lib"
IntermediateDirectory="..\lib\obj\release"
ConfigurationType="4"
CharacterSet="2"
>
......@@ -111,24 +111,25 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\includes"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_STLP_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\includes; ..\src"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
FloatingPointModel="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough="StdAfx.h"
PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -142,7 +143,8 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="dxguid.lib dinput8.lib"
OutputFile="$(OutDir)/OIS_d.lib"
OutputFile="$(OutDir)/OIS_static.lib"
AdditionalLibraryDirectories="..\src\win32\extras\WiiMote"
/>
<Tool
Name="VCALinkTool"
......@@ -162,10 +164,10 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\lib"
IntermediateDirectory="..\lib\obj\release"
ConfigurationType="4"
Name="OIS_ReleaseDll|Win32"
OutputDirectory="..\dll"
IntermediateDirectory="..\dll\release"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
......@@ -189,7 +191,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\includes; ..\src"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
......@@ -212,14 +214,23 @@
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dinput8.lib"
OutputFile="$(OutDir)/OIS_static.lib"
AdditionalLibraryDirectories="..\src\win32\extras\WiiMote"
AdditionalLibraryDirectories="..\src\win32\extras\WiiMote\"
GenerateDebugInformation="false"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
......@@ -229,18 +240,20 @@
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="..\lib64\"
IntermediateDirectory="..\lib64\obj\$(ConfigurationName)"
ConfigurationType="4"
Name="OIS_DebugDll|Win32"
OutputDirectory="..\dll"
IntermediateDirectory="..\dll\debug"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -256,28 +269,23 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\includes"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
Optimization="0"
AdditionalIncludeDirectories="..\includes; ..\src"
PreprocessorDefinitions="WIN32;_DEBUG;_STLP_DEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
FloatingPointModel="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
PrecompiledHeaderThrough="StdAfx.h"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -289,13 +297,20 @@
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dinput8.lib"
OutputFile="$(OutDir)/OIS.lib"
OutputFile="$(OutDir)/OIS_d.dll"
AdditionalLibraryDirectories="..\src\win32\extras\WiiMote\"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
......@@ -305,16 +320,19 @@
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="OIS_ReleaseDll|Win32"
OutputDirectory="..\dll"
IntermediateDirectory="..\dll\release"
ConfigurationType="2"
Name="Debug|x64"
OutputDirectory="..\lib64\"
IntermediateDirectory="..\lib64\obj\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
<Tool
......@@ -331,25 +349,24 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\includes; ..\src"
PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
Optimization="0"
AdditionalIncludeDirectories="..\includes"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_STLP_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
FloatingPointModel="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
PrecompiledHeaderThrough="StdAfx.h"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -361,23 +378,13 @@
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
Name="VCLibrarianTool"
AdditionalDependencies="dxguid.lib dinput8.lib"
AdditionalLibraryDirectories="..\src\win32\extras\WiiMote\"
GenerateDebugInformation="false"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
LinkTimeCodeGeneration="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
OutputFile="$(OutDir)/OIS_d.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
......@@ -387,19 +394,16 @@
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="OIS_ReleaseDll|x64"
OutputDirectory="..\dll64"
IntermediateDirectory="..\dll64\$(ConfigurationName)"
ConfigurationType="2"
Name="Release|x64"
OutputDirectory="..\lib64\"
IntermediateDirectory="..\lib64\obj\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
>
......@@ -428,7 +432,7 @@
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\includes"
PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
......@@ -450,19 +454,13 @@
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
Name="VCLibrarianTool"
AdditionalDependencies="dxguid.lib dinput8.lib"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
OutputFile="$(OutDir)/OIS.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
......@@ -472,20 +470,18 @@
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="OIS_DebugDll|Win32"
OutputDirectory="..\dll"
IntermediateDirectory="..\dll\debug"
Name="OIS_ReleaseDll|x64"
OutputDirectory="..\dll64"
IntermediateDirectory="..\dll64\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -501,23 +497,28 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\includes; ..\src"
PreprocessorDefinitions="WIN32;_DEBUG;_STLP_DEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Optimization="2"
InlineFunctionExpansion="1"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\includes"
PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
FloatingPointModel="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough="StdAfx.h"
PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -531,11 +532,10 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dinput8.lib"
OutputFile="$(OutDir)/OIS_d.dll"
AdditionalLibraryDirectories="..\src\win32\extras\WiiMote\"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -878,6 +878,45 @@
>
</Filter>
</Filter>
<File
RelativePath=".\OIS.rc"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="OIS_ReleaseDll|Win32"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="OIS_DebugDll|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\resource.h"
>
</File>
</Files>
<Globals>
</Globals>
......
Win32/resource.h 0 → 100644
View file @ d44381f7
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by OIS.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
configure.ac
View file @ d44381f7
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT( [OIS], 1.2.0 )
AC_INIT( [OIS], 1.3.0 )
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE( [OIS], 1.2.0 )
AM_INIT_AUTOMAKE( [OIS], 1.3.0 )
AM_CONFIG_HEADER([includes/config.h])
dnl Check for programs
......
includes/OISPrereqs.h
View file @ d44381f7
......@@ -100,9 +100,9 @@ restrictions:
//-------------- Common Classes, Enums, and Typdef's -------------------------//
#define OIS_VERSION_MAJOR 1
#define OIS_VERSION_MINOR 2
#define OIS_VERSION_MINOR 4
#define OIS_VERSION_PATCH 0
#define OIS_VERSION_NAME "Smash"
#define OIS_VERSION_NAME "1.4.0"
#define OIS_VERSION ((OIS_VERSION_MAJOR << 16) | (OIS_VERSION_MINOR << 8) | OIS_VERSION_PATCH)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment