diff --git a/.gitignore b/.gitignore index b1fe24b62d553800696eea6987741a592ce45c0e..15a83c7356f3abbdd4864aac3d7f2d46684236fa 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ examples/asynchronous.o examples/callbacks.exe examples/callbacks.o examples/echo.exe +examples/echo_dbg.exe examples/echo.o examples/hello.exe examples/hello.o @@ -79,3 +80,9 @@ examples/Debug/** examples/Release/** Debug/** Release/** +examples/*.txt +examples/*.flt +examples/*.dot +examples/DSPElib_examples.exe +examples/DSPElib_examples_dbg.exe + diff --git a/examples/DSPElib_examples.vcxproj b/examples/DSPElib_examples.vcxproj index 1298bf0a5ed987a55fbf4520bcf06043ccd7afb2..bded52d60a4851593b7427c47856ef52285d8037 100644 --- a/examples/DSPElib_examples.vcxproj +++ b/examples/DSPElib_examples.vcxproj @@ -72,23 +72,27 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir> - <IntDir>$(Configuration)\$(Platform)\</IntDir> + <OutDir>$(SolutionDir)\examples\$(Configuration)\$(Platform)\</OutDir> + <ExeOutDir>$(SolutionDir)\examples\</ExeOutDir> + <IntDir>$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> - <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir> - <IntDir>$(Configuration)\$(Platform)\</IntDir> + <OutDir>$(SolutionDir)\examples\$(Configuration)\$(Platform)\</OutDir> + <ExeOutDir>$(SolutionDir)\examples\</ExeOutDir> + <IntDir>$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir> - <IntDir>$(Configuration)\$(Platform)\</IntDir> + <OutDir>$(SolutionDir)\examples\$(Configuration)\$(Platform)\</OutDir> + <ExeOutDir>$(SolutionDir)\examples\</ExeOutDir> + <IntDir>$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> - <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir> - <IntDir>$(Configuration)\$(Platform)\</IntDir> + <OutDir>$(SolutionDir)\examples\$(Configuration)\$(Platform)\</OutDir> + <ExeOutDir>$(SolutionDir)\examples\</ExeOutDir> + <IntDir>$(Configuration)\$(Platform)\$(ProjectName)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -97,7 +101,7 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_X86_;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)src\include\dbg;$(SolutionDir)src\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -106,6 +110,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalLibraryDirectories>$(SolutionDir)..\_DSPE_lib_VStudio_\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>DSPElib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(ExeOutDir)$(TargetName)_dbg$(TargetExt)</OutputFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -124,6 +129,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalLibraryDirectories>$(SolutionDir)..\_DSPE_lib_VStudio_\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>DSPElib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(ExeOutDir)$(TargetName)_dbg$(TargetExt)</OutputFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -135,7 +141,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_X86_;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)src\include\rls;$(SolutionDir)src\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -146,6 +152,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalLibraryDirectories>$(SolutionDir)..\_DSPE_lib_VStudio_\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>DSPElib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(ExeOutDir)$(TargetName)$(TargetExt)</OutputFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -168,6 +175,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalLibraryDirectories>$(SolutionDir)..\_DSPE_lib_VStudio_\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>DSPElib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(ExeOutDir)$(TargetName)$(TargetExt)</OutputFile> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/examples/echo.vcxproj b/examples/echo.vcxproj index fc905e3817ef4640a02949d0e90f29c0e04970d1..c864f7238f72abe65451f75078aa4e95cedeeed5 100644 --- a/examples/echo.vcxproj +++ b/examples/echo.vcxproj @@ -101,7 +101,7 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_X86_;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)src\include\dbg;$(SolutionDir)src\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -141,7 +141,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_X86_;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)src\include\rls;$(SolutionDir)src\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> diff --git a/examples/echo.vcxproj.filters b/examples/echo.vcxproj.filters new file mode 100644 index 0000000000000000000000000000000000000000..2ad55f590025478823e6f7752438d78f7ea7ce5b --- /dev/null +++ b/examples/echo.vcxproj.filters @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Pliki źródłowe"> + <UniqueIdentifier>{CD66B29E-39C0-4528-897A-EB22E7AE6463}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Pliki nagłówkowe"> + <UniqueIdentifier>{385AA0E3-E3EC-4191-A609-25DE06E922F4}</UniqueIdentifier> + <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> + </Filter> + <Filter Include="Pliki zasobów"> + <UniqueIdentifier>{8DCDB654-9B4F-410A-B593-68EDA83CF8A5}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="echo.cpp"> + <Filter>Pliki źródłowe</Filter> + </ClCompile> + </ItemGroup> +</Project> \ No newline at end of file diff --git a/examples/echo_dbg.exe b/examples/echo_dbg.exe deleted file mode 100644 index 0fbbb57d316e2bbd5172880a8f3fea4e7fe94327..0000000000000000000000000000000000000000 Binary files a/examples/echo_dbg.exe and /dev/null differ