This commit is contained in:
Simon Rozman 2013-10-14 10:31:38 +00:00
parent 22acff693a
commit a424f90b15
6 changed files with 34 additions and 13 deletions

6
.gitattributes vendored
View File

@ -1,8 +1,8 @@
* text=auto !eol * text=auto !eol
AMSICA/AMSICA-10.0.sln svneol=CRLF#text/plain eol=crlf AMSICA/AMSICA-10.0.sln svneol=CRLF#text/plain eol=crlf
AMSICA/AMSICA.props -text svneol=unset#text/xml AMSICA/build/AMSICA.props -text svneol=unset#text/xml
AMSICA/AMSICALib/AMSICALib.vcxproj -text svneol=unset#text/xml AMSICA/build/AMSICALib.vcxproj -text svneol=unset#text/xml
AMSICA/AMSICALib/AMSICALib.vcxproj.filters -text svneol=unset#text/xml AMSICA/build/AMSICALib.vcxproj.filters -text svneol=unset#text/xml
AMSICA/include/AMSICA.h -text AMSICA/include/AMSICA.h -text
AMSICA/include/StdAfx.h -text AMSICA/include/StdAfx.h -text
AMSICA/msm/Makefile -text svneol=unset#text/plain%3B+charset%3DWindows-1250 AMSICA/msm/Makefile -text svneol=unset#text/plain%3B+charset%3DWindows-1250

10
.gitignore vendored
View File

@ -1,11 +1,11 @@
AMSICA/*.opensdf AMSICA/*.opensdf
AMSICA/*.sdf AMSICA/*.sdf
AMSICA/*.suo AMSICA/*.suo
AMSICA/AMSICALib/*.user AMSICA/build/*.user
AMSICA/AMSICALib/Debug.Win32 AMSICA/build/AMSICALib.Debug.Win32
AMSICA/AMSICALib/Debug.x64 AMSICA/build/AMSICALib.Debug.x64
AMSICA/AMSICALib/Release.Win32 AMSICA/build/AMSICALib.Release.Win32
AMSICA/AMSICALib/Release.x64 AMSICA/build/AMSICALib.Release.x64
AMSICA/msm/*-1.idt AMSICA/msm/*-1.idt
AMSICA/msm/*-2.idt AMSICA/msm/*-2.idt
AMSICA/msm/*-2.idtx AMSICA/msm/*-2.idtx

View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMSICALib", "AMSICALib\AMSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMSICALib", "build\AMSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@ -70,12 +70,33 @@
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" /> <Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <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\Amebis.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis $(Configuration).props" Condition="exists('$(VCInstallDir)VCProjectDefaults\Amebis $(Configuration).props')" /> <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" />
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis $(Platform).props" Condition="exists('$(VCInstallDir)VCProjectDefaults\Amebis $(Platform).props')" /> <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" />
<Import Project="..\AMSICA.props" /> <Import Project="AMSICA.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<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> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugU|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugU|Win32'" />