Renaming main files, caused problems with VS

teragonaudio · Nov 8, 2012 · f8d1f2d · f8d1f2d
1 parent 840dc76
commit f8d1f2d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/main/main.c → main/MrsWatsonMain.c b/main/main.c → main/MrsWatsonMain.c
diff --git a/projects/VisualStudio/MrsWatson.vcxproj b/projects/VisualStudio/MrsWatson.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\main\main.c" />
+    <ClCompile Include="..\..\main\MrsWatsonMain.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2AABEEE4-5AFE-4953-BDF8-F0AE6D543A72}</ProjectGuid>
@@ -65,7 +65,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(SolutionDir)..\..\build\$(Configuration)\libMrsWatson.lib;$(SolutionDir)..\..\archive_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\..\build\$(Configuration)\libMrsWatson.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
     </Link>
@@ -87,7 +87,7 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(SolutionDir)..\..\build\$(Configuration)\libMrsWatson.lib;$(SolutionDir)..\..\archive_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\..\build\$(Configuration)\libMrsWatson.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>

diff --git a/projects/VisualStudio/MrsWatson.vcxproj.filters b/projects/VisualStudio/MrsWatson.vcxproj.filters
@@ -7,7 +7,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\main\main.c">
+    <ClCompile Include="..\..\main\MrsWatsonMain.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/projects/VisualStudio/MrsWatsonTest.vcxproj b/projects/VisualStudio/MrsWatsonTest.vcxproj
@@ -26,7 +26,7 @@
     <ClCompile Include="..\..\test\FileUtilitiesTest.c" />
     <ClCompile Include="..\..\test\InternalTestSuite.c" />
     <ClCompile Include="..\..\test\LinkedListTest.c" />
-    <ClCompile Include="..\..\test\main.c" />
+    <ClCompile Include="..\..\test\MrsWatsonTestMain.c" />
     <ClCompile Include="..\..\test\MidiSequenceTest.c" />
     <ClCompile Include="..\..\test\MidiSourceTest.c" />
     <ClCompile Include="..\..\test\PlatformUtilitiesTest.c" />
@@ -46,7 +46,7 @@
     <ClInclude Include="..\..\test\AnalysisSilence.h" />
     <ClInclude Include="..\..\test\AnalyzeFile.h" />
     <ClInclude Include="..\..\test\ApplicationRunner.h" />
-    <ClInclude Include="..\..\test\main.h" />
+    <ClInclude Include="..\..\test\MrsWatsonTestMain.h" />
     <ClInclude Include="..\..\test\TestRunner.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

diff --git a/projects/VisualStudio/MrsWatsonTest.vcxproj.filters b/projects/VisualStudio/MrsWatsonTest.vcxproj.filters
@@ -51,9 +51,6 @@
     <ClCompile Include="..\..\test\LinkedListTest.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\test\main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\test\MidiSequenceTest.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -90,6 +87,9 @@
     <ClCompile Include="..\..\test\TestRunner.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\test\MrsWatsonTestMain.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\test\AnalysisClipping.h">
@@ -107,10 +107,10 @@
     <ClInclude Include="..\..\test\ApplicationRunner.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\test\main.h">
+    <ClInclude Include="..\..\test\TestRunner.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\test\TestRunner.h">
+    <ClInclude Include="..\..\test\MrsWatsonTestMain.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/test/main.c → test/MrsWatsonTestMain.c b/test/main.c → test/MrsWatsonTestMain.c
diff --git a/test/main.h → test/MrsWatsonTestMain.h b/test/main.h → test/MrsWatsonTestMain.h