A bunch of fixes to the MSBuild projects.

Originally committed to SVN as r6514.
This commit is contained in:
Niels Martin Hansen 2012-02-24 22:48:52 +00:00
parent 5fd05762bd
commit 45da185a43
5 changed files with 13 additions and 21 deletions

View file

@ -67,7 +67,7 @@
<ClInclude Include="$(SrcDir)audio_controller.h" /> <ClInclude Include="$(SrcDir)audio_controller.h" />
<ClInclude Include="$(SrcDir)audio_display.h" /> <ClInclude Include="$(SrcDir)audio_display.h" />
<ClInclude Include="$(SrcDir)audio_karaoke.h" /> <ClInclude Include="$(SrcDir)audio_karaoke.h" />
<ClInclude Include="$(SrcDir)audio_marker_provider_keyframes.h" /> <ClInclude Include="$(SrcDir)audio_marker.h" />
<ClInclude Include="$(SrcDir)audio_player_alsa.h" /> <ClInclude Include="$(SrcDir)audio_player_alsa.h" />
<ClInclude Include="$(SrcDir)audio_player_dsound.h" /> <ClInclude Include="$(SrcDir)audio_player_dsound.h" />
<ClInclude Include="$(SrcDir)audio_player_dsound2.h" /> <ClInclude Include="$(SrcDir)audio_player_dsound2.h" />
@ -151,7 +151,6 @@
<ClInclude Include="$(SrcDir)MatroskaParser.h" /> <ClInclude Include="$(SrcDir)MatroskaParser.h" />
<ClInclude Include="$(SrcDir)md5.h" /> <ClInclude Include="$(SrcDir)md5.h" />
<ClInclude Include="$(SrcDir)mkv_wrap.h" /> <ClInclude Include="$(SrcDir)mkv_wrap.h" />
<ClInclude Include="$(SrcDir)mythes.hxx" />
<ClInclude Include="$(SrcDir)persist_location.h" /> <ClInclude Include="$(SrcDir)persist_location.h" />
<ClInclude Include="$(SrcDir)pen.h" /> <ClInclude Include="$(SrcDir)pen.h" />
<ClInclude Include="$(SrcDir)plugin_manager.h" /> <ClInclude Include="$(SrcDir)plugin_manager.h" />
@ -182,7 +181,6 @@
<ClInclude Include="$(SrcDir)text_file_reader.h" /> <ClInclude Include="$(SrcDir)text_file_reader.h" />
<ClInclude Include="$(SrcDir)text_file_writer.h" /> <ClInclude Include="$(SrcDir)text_file_writer.h" />
<ClInclude Include="$(SrcDir)thesaurus.h" /> <ClInclude Include="$(SrcDir)thesaurus.h" />
<ClInclude Include="$(SrcDir)thesaurus_myspell.h" />
<ClInclude Include="$(SrcDir)threaded_frame_source.h" /> <ClInclude Include="$(SrcDir)threaded_frame_source.h" />
<ClInclude Include="$(SrcDir)timeedit_ctrl.h" /> <ClInclude Include="$(SrcDir)timeedit_ctrl.h" />
<ClInclude Include="$(SrcDir)toggle_bitmap.h" /> <ClInclude Include="$(SrcDir)toggle_bitmap.h" />
@ -238,7 +236,7 @@
<ClCompile Include="$(SrcDir)audio_controller.cpp" /> <ClCompile Include="$(SrcDir)audio_controller.cpp" />
<ClCompile Include="$(SrcDir)audio_display.cpp" /> <ClCompile Include="$(SrcDir)audio_display.cpp" />
<ClCompile Include="$(SrcDir)audio_karaoke.cpp" /> <ClCompile Include="$(SrcDir)audio_karaoke.cpp" />
<ClCompile Include="$(SrcDir)audio_marker_provider_keyframes.cpp" /> <ClCompile Include="$(SrcDir)audio_marker.cpp" />
<ClCompile Include="$(SrcDir)audio_player.cpp" /> <ClCompile Include="$(SrcDir)audio_player.cpp" />
<ClCompile Include="$(SrcDir)audio_player_alsa.cpp" /> <ClCompile Include="$(SrcDir)audio_player_alsa.cpp" />
<ClCompile Include="$(SrcDir)audio_player_dsound.cpp" /> <ClCompile Include="$(SrcDir)audio_player_dsound.cpp" />
@ -343,7 +341,6 @@
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)menu.cpp" /> <ClCompile Include="$(SrcDir)menu.cpp" />
<ClCompile Include="$(SrcDir)mkv_wrap.cpp" /> <ClCompile Include="$(SrcDir)mkv_wrap.cpp" />
<ClCompile Include="$(SrcDir)mythes.cxx" />
<ClCompile Include="$(SrcDir)pen.cpp" /> <ClCompile Include="$(SrcDir)pen.cpp" />
<ClCompile Include="$(SrcDir)persist_location.cpp" /> <ClCompile Include="$(SrcDir)persist_location.cpp" />
<ClCompile Include="$(SrcDir)plugin_manager.cpp" /> <ClCompile Include="$(SrcDir)plugin_manager.cpp" />
@ -375,7 +372,6 @@
<ClCompile Include="$(SrcDir)text_file_reader.cpp" /> <ClCompile Include="$(SrcDir)text_file_reader.cpp" />
<ClCompile Include="$(SrcDir)text_file_writer.cpp" /> <ClCompile Include="$(SrcDir)text_file_writer.cpp" />
<ClCompile Include="$(SrcDir)thesaurus.cpp" /> <ClCompile Include="$(SrcDir)thesaurus.cpp" />
<ClCompile Include="$(SrcDir)thesaurus_myspell.cpp" />
<ClCompile Include="$(SrcDir)threaded_frame_source.cpp" /> <ClCompile Include="$(SrcDir)threaded_frame_source.cpp" />
<ClCompile Include="$(SrcDir)timeedit_ctrl.cpp" /> <ClCompile Include="$(SrcDir)timeedit_ctrl.cpp" />
<ClCompile Include="$(SrcDir)toggle_bitmap.cpp" /> <ClCompile Include="$(SrcDir)toggle_bitmap.cpp" />

View file

@ -207,7 +207,7 @@
<ClInclude Include="$(SrcDir)audio_karaoke.h"> <ClInclude Include="$(SrcDir)audio_karaoke.h">
<Filter>Audio\UI</Filter> <Filter>Audio\UI</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SrcDir)audio_marker_provider_keyframes.h"> <ClInclude Include="$(SrcDir)audio_marker.h">
<Filter>Audio\UI</Filter> <Filter>Audio\UI</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SrcDir)audio_renderer.h"> <ClInclude Include="$(SrcDir)audio_renderer.h">
@ -378,12 +378,6 @@
<ClInclude Include="$(SrcDir)spellchecker_hunspell.h"> <ClInclude Include="$(SrcDir)spellchecker_hunspell.h">
<Filter>Features\Spell checker</Filter> <Filter>Features\Spell checker</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SrcDir)mythes.hxx">
<Filter>Features\Thesaurus</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)thesaurus_myspell.h">
<Filter>Features\Thesaurus</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)thesaurus.h"> <ClInclude Include="$(SrcDir)thesaurus.h">
<Filter>Features\Thesaurus</Filter> <Filter>Features\Thesaurus</Filter>
</ClInclude> </ClInclude>
@ -707,7 +701,7 @@
<ClCompile Include="$(SrcDir)audio_karaoke.cpp"> <ClCompile Include="$(SrcDir)audio_karaoke.cpp">
<Filter>Audio\UI</Filter> <Filter>Audio\UI</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)audio_marker_provider_keyframes.cpp"> <ClCompile Include="$(SrcDir)audio_marker.cpp">
<Filter>Audio\UI</Filter> <Filter>Audio\UI</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)audio_renderer.cpp"> <ClCompile Include="$(SrcDir)audio_renderer.cpp">
@ -956,15 +950,9 @@
<ClCompile Include="$(SrcDir)spellchecker_hunspell.cpp"> <ClCompile Include="$(SrcDir)spellchecker_hunspell.cpp">
<Filter>Features\Spell checker</Filter> <Filter>Features\Spell checker</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)mythes.cxx">
<Filter>Features\Thesaurus</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)thesaurus.cpp"> <ClCompile Include="$(SrcDir)thesaurus.cpp">
<Filter>Features\Thesaurus</Filter> <Filter>Features\Thesaurus</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)thesaurus_myspell.cpp">
<Filter>Features\Thesaurus</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)dialog_resample.cpp"> <ClCompile Include="$(SrcDir)dialog_resample.cpp">
<Filter>Features\Resolution resampler</Filter> <Filter>Features\Resolution resampler</Filter>
</ClCompile> </ClCompile>

View file

@ -119,7 +119,7 @@
</StringProperty> </StringProperty>
<BoolProperty <BoolProperty
Name="AegisubUseFt2" Name="AegisubUseFreetype2"
Category="Features" Category="Features"
DisplayName="Use Freetype 2" DisplayName="Use Freetype 2"
Description="Specify whether to use Freetype 2 for font enumeration in the Font Collector. You will need to configure the location of the Freetype 2 library on the Library paths page." Description="Specify whether to use Freetype 2 for font enumeration in the Font Collector. You will need to configure the location of the Freetype 2 library on the Library paths page."

View file

@ -65,6 +65,7 @@
<ClInclude Include="$(SrcDir)include\libaegisub\path.h" /> <ClInclude Include="$(SrcDir)include\libaegisub\path.h" />
<ClInclude Include="$(SrcDir)include\libaegisub\scoped_ptr.h" /> <ClInclude Include="$(SrcDir)include\libaegisub\scoped_ptr.h" />
<ClInclude Include="$(SrcDir)include\libaegisub\signal.h" /> <ClInclude Include="$(SrcDir)include\libaegisub\signal.h" />
<ClInclude Include="$(SrcDir)include\libaegisub\thesaurus.h" />
<ClInclude Include="$(SrcDir)include\libaegisub\types.h" /> <ClInclude Include="$(SrcDir)include\libaegisub\types.h" />
<ClInclude Include="$(SrcDir)include\libaegisub\util.h" /> <ClInclude Include="$(SrcDir)include\libaegisub\util.h" />
<ClInclude Include="$(SrcDir)include\libaegisub\util_osx.h" /> <ClInclude Include="$(SrcDir)include\libaegisub\util_osx.h" />
@ -95,6 +96,7 @@
<ClCompile Include="$(SrcDir)common\option.cpp" /> <ClCompile Include="$(SrcDir)common\option.cpp" />
<ClCompile Include="$(SrcDir)common\option_visit.cpp" /> <ClCompile Include="$(SrcDir)common\option_visit.cpp" />
<ClCompile Include="$(SrcDir)common\path.cpp" /> <ClCompile Include="$(SrcDir)common\path.cpp" />
<ClCompile Include="$(SrcDir)common\thesaurus.cpp" />
<ClCompile Include="$(SrcDir)common\util.cpp" /> <ClCompile Include="$(SrcDir)common\util.cpp" />
<ClCompile Include="$(SrcDir)common\validator.cpp" /> <ClCompile Include="$(SrcDir)common\validator.cpp" />
<ClCompile Include="$(SrcDir)common\vfr.cpp" /> <ClCompile Include="$(SrcDir)common\vfr.cpp" />

View file

@ -71,6 +71,9 @@
<ClInclude Include="$(SrcDir)include\libaegisub\scoped_ptr.h"> <ClInclude Include="$(SrcDir)include\libaegisub\scoped_ptr.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SrcDir)include\libaegisub\thesaurus.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SrcDir)include\libaegisub\types.h"> <ClInclude Include="$(SrcDir)include\libaegisub\types.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -160,6 +163,9 @@
<ClCompile Include="$(SrcDir)common\path.cpp"> <ClCompile Include="$(SrcDir)common\path.cpp">
<Filter>Source Files\Common</Filter> <Filter>Source Files\Common</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)common\thesaurus.cpp">
<Filter>Source Files\Common</Filter>
</ClCompile>
<ClCompile Include="$(SrcDir)windows\util_win.cpp"> <ClCompile Include="$(SrcDir)windows\util_win.cpp">
<Filter>Source Files\Windows</Filter> <Filter>Source Files\Windows</Filter>
</ClCompile> </ClCompile>