Move the MSVC/lwIP code into the main line.

[freertos] / Demo / WIN32-MSVC / WIN32.vcxproj

diff --git a/Demo/WIN32-MSVC/WIN32.vcxproj b/Demo/WIN32-MSVC/WIN32.vcxproj
index 78945596755c2779b8882dddacab6733df34b264..3d96fb03d2e06f1ae594a5e8cfcf55e61f8ae449 100644 (file)
--- a/Demo/WIN32-MSVC/WIN32.vcxproj
+++ b/Demo/WIN32-MSVC/WIN32.vcxproj
@@ -55,7 +55,7 @@
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\..\Source\include;..\..\Source\portable\MSVC-MingW;..\Common\Include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0400;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
@@ -66,6 +66,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -78,6 +79,7 @@
       <ProgramDatabaseFile>.\Debug/WIN32.pdb</ProgramDatabaseFile>\r
       <SubSystem>Console</SubSystem>\r
       <TargetMachine>MachineX86</TargetMachine>\r
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
     <Bscmake>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
@@ -93,7 +95,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -103,13 +105,14 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalIncludeDirectories>..\..\Source\include;..\..\Source\portable\MSVC-MingW;..\Common\Include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <Culture>0x0c09</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>.\Release/WIN32.exe</OutputFile>\r
+      <OutputFile>.\Release/RTOSDemo.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\Release/WIN32.pdb</ProgramDatabaseFile>\r
       <SubSystem>Console</SubSystem>\r
@@ -122,6 +125,18 @@
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\Source\portable\MemMang\heap_3.c" />\r
+    <ClCompile Include="..\..\Source\timers.c" />\r
+    <ClCompile Include="..\Common\Minimal\BlockQ.c" />\r
+    <ClCompile Include="..\Common\Minimal\blocktim.c" />\r
+    <ClCompile Include="..\Common\Minimal\countsem.c" />\r
+    <ClCompile Include="..\Common\Minimal\flop.c" />\r
+    <ClCompile Include="..\Common\Minimal\GenQTest.c" />\r
+    <ClCompile Include="..\Common\Minimal\integer.c" />\r
+    <ClCompile Include="..\Common\Minimal\PollQ.c" />\r
+    <ClCompile Include="..\Common\Minimal\QPeek.c" />\r
+    <ClCompile Include="..\Common\Minimal\semtest.c" />\r
+    <ClCompile Include="..\Common\Minimal\timerdemo.c" />\r
+    <ClCompile Include="DemosModifiedForLowTickRate\recmutex.c" />\r
     <ClCompile Include="main.c">\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -149,7 +164,9 @@
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="Board.h" />\r
+    <ClInclude Include="..\..\Source\include\timers.h" />\r
+    <ClInclude Include="..\..\Source\include\timer_test.h" />\r
+    <ClInclude Include="..\..\Source\portable\MSVC-MingW\portmacro.h" />\r
     <ClInclude Include="FreeRTOSConfig.h" />\r
     <ClInclude Include="..\..\Source\include\croutine.h" />\r
     <ClInclude Include="..\..\Source\include\FreeRTOS.h" />\r