iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename another clashing file in libaegisub. 

Originally committed to SVN as r5490.
This commit is contained in:
Niels Martin Hansen 2011-07-18 01:08:41 +00:00
parent 89b97a55be
commit b60e3a5bd4
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
aegisub/build/libaegisub_vs2008/libaegisub_vs2008.vcproj
View File

@ -378,24 +378,8 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\libaegisub\windows\log.cpp" RelativePath="..\..\libaegisub\windows\log_win.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\log_windows"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\log_windows"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\libaegisub\windows\path_win.cpp" RelativePath="..\..\libaegisub\windows\path_win.cpp"

2
aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
View File

@ -101,7 +101,7 @@
<ClCompile Include="$(SrcDir)windows\access.cpp" /> <ClCompile Include="$(SrcDir)windows\access.cpp" />
<ClCompile Include="$(SrcDir)windows\charset_conv_win.cpp" /> <ClCompile Include="$(SrcDir)windows\charset_conv_win.cpp" />
<ClCompile Include="$(SrcDir)windows\io.cpp" /> <ClCompile Include="$(SrcDir)windows\io.cpp" />
<ClCompile Include="$(SrcDir)windows\log.cpp" /> <ClCompile Include="$(SrcDir)windows\log_win.cpp" />
<ClCompile Include="$(SrcDir)windows\path_win.cpp" /> <ClCompile Include="$(SrcDir)windows\path_win.cpp" />
<ClCompile Include="$(SrcDir)windows\util_win.cpp" /> <ClCompile Include="$(SrcDir)windows\util_win.cpp" />
</ItemGroup> </ItemGroup>

3
aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
View File

@ -151,6 +151,9 @@
<ClCompile Include="$(SrcDir)common\log.cpp"> <ClCompile Include="$(SrcDir)common\log.cpp">
<Filter>Source Files\Common</Filter> <Filter>Source Files\Common</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)windows\log_win.cpp">
<Filter>Source Files\Windows</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)common\mru.cpp"> <ClCompile Include="$(SrcDir)common\mru.cpp">
<Filter>Source Files\Common</Filter> <Filter>Source Files\Common</Filter>
</ClCompile> </ClCompile>

0
aegisub/libaegisub/windows/log.cpp → aegisub/libaegisub/windows/log_win.cpp
View File