Spremenil sem konfiguracije projekta:

- Ukinil sem Release in Debug (podpora za Win9x).
- Unicode Release in Unicode Debug sta postala nova Release in Debug.

Dodal sem datoteko SLN.

Verzijo sem nastavil na 2.0-pre.
This commit is contained in:
Simon Rozman 2013-10-11 07:09:40 +00:00
parent e7bf86e14f
commit 0c1e123d5f
6 changed files with 43 additions and 119 deletions

1
.gitattributes vendored
View File

@ -1,4 +1,5 @@
* text=auto !eol
AMSICA/AMSICA-10.0.sln svneol=CRLF#text/plain eol=crlf
AMSICA/AMSICA.props -text svneol=unset#text/xml
AMSICA/AMSICALib/AMSICALib.vcxproj -text svneol=unset#text/xml
AMSICA/AMSICALib/AMSICALib.vcxproj.filters -text svneol=unset#text/xml

7
.gitignore vendored
View File

@ -1,12 +1,11 @@
AMSICA/*.opensdf
AMSICA/*.sdf
AMSICA/*.suo
AMSICA/AMSICALib/*.user
AMSICA/AMSICALib/Debug.Win32
AMSICA/AMSICALib/Debug.x64
AMSICA/AMSICALib/Release.Win32
AMSICA/AMSICALib/Release.x64
AMSICA/AMSICALib/Unicode[!!-~]Debug.Win32
AMSICA/AMSICALib/Unicode[!!-~]Debug.x64
AMSICA/AMSICALib/Unicode[!!-~]Release.Win32
AMSICA/AMSICALib/Unicode[!!-~]Release.x64
AMSICA/msm/*-1.idt
AMSICA/msm/*-2.idt
AMSICA/msm/*-2.idtx

26
AMSICA/AMSICA-10.0.sln Normal file
View File

@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMSICALib", "AMSICALib\AMSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.ActiveCfg = Debug|Win32
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.Build.0 = Debug|Win32
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.ActiveCfg = Debug|x64
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.Build.0 = Debug|x64
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.ActiveCfg = Release|Win32
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.Build.0 = Release|Win32
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.ActiveCfg = Release|x64
{8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -17,22 +17,6 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Unicode Debug|Win32">
<Configuration>Unicode Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Unicode Debug|x64">
<Configuration>Unicode Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Unicode Release|Win32">
<Configuration>Unicode Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Unicode Release|x64">
<Configuration>Unicode Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\AMSICA.cpp" />
@ -42,12 +26,8 @@
<ClCompile Include="..\src\StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
@ -64,45 +44,23 @@
<ProjectName>AMSICALib</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<UseOfAtl>Static</UseOfAtl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<UseOfAtl>Static</UseOfAtl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<UseOfAtl>Static</UseOfAtl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<UseOfAtl>Static</UseOfAtl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<UseOfAtl>Static</UseOfAtl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<UseOfAtl>Static</UseOfAtl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<UseOfAtl>Static</UseOfAtl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
@ -112,13 +70,6 @@
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" />
<Import Project="..\AMSICA.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
@ -133,20 +84,6 @@
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" />
<Import Project="..\AMSICA.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisRelease.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" />
<Import Project="..\AMSICA.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" />
<Import Project="..\AMSICA.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
@ -161,15 +98,15 @@
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" />
<Import Project="..\AMSICA.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisRelease.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" />
<Import Project="..\AMSICA.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugU|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugU|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseU|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseU|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugU|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugU|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseU|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseU|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile />
<Link>
@ -184,20 +121,6 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
<ClCompile />
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
<ClCompile />
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile />
<Link>
@ -216,24 +139,6 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
<ClCompile />
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
<ClCompile />
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View File

@ -5,13 +5,13 @@
// Version
////////////////////////////////////////////////////////////////////////////
#define AMSICA_VERSION 0x01020000
#define AMSICA_VERSION 0x010ff000
#define AMSICA_VERSION_MAJ 1
#define AMSICA_VERSION_MIN 2
#define AMSICA_VERSION_MIN 255
#define AMSICA_VERSION_REV 0
#define AMSICA_VERSION_STR "1.2"
#define AMSICA_VERSION_STR "2.0-pre"
#if !defined(RC_INVOKED) && !defined(MIDL_PASS)

View File

@ -1,13 +1,6 @@
!INCLUDE "..\..\include\MSINast.mak"
MSM_IMA_LOKALIZACIJO=1
!IF "$(CFG)" == "ReleaseU"
CFG_VC=Unicode Release
!ELSEIF "$(CFG)" == "DebugU"
CFG_VC=Unicode Debug
!ELSE
CFG_VC=$(CFG)
!ENDIF
######################################################################