From d63a646c2abf1aa3d6926ee5aa05e6f7503b21da Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sat, 11 Dec 2010 16:35:22 +0000 Subject: [PATCH] Small beginnings of MSBuild-based build system, for Visual Studio 2010/Windows 7.1 SDK. So far proof of concept building just the respack program, using a semi-generalised form of finding wxWidgets. For it to find wxWidgets, a user configuration needs to be placed in the userconfig dir, see readme.txt. Originally committed to SVN as r4954. --- aegisub/build/msbuild/respack/respack.vcxproj | 73 +++++++++++++++++++ .../msbuild/respack/respack.vcxproj.filters | 22 ++++++ aegisub/build/msbuild/userconfig/readme.txt | 29 ++++++++ aegisub/build/msbuild/wx.props | 37 ++++++++++ 4 files changed, 161 insertions(+) create mode 100644 aegisub/build/msbuild/respack/respack.vcxproj create mode 100644 aegisub/build/msbuild/respack/respack.vcxproj.filters create mode 100644 aegisub/build/msbuild/userconfig/readme.txt create mode 100644 aegisub/build/msbuild/wx.props diff --git a/aegisub/build/msbuild/respack/respack.vcxproj b/aegisub/build/msbuild/respack/respack.vcxproj new file mode 100644 index 000000000..34c282d8f --- /dev/null +++ b/aegisub/build/msbuild/respack/respack.vcxproj @@ -0,0 +1,73 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} + respack + + + + Application + Unicode + true + false + true + + + + + + + + + + + $(ProjectDir) + $(ProjectDir)$(Configuration)\ + respackd + + + $(ProjectDir) + $(ProjectDir)$(Configuration)\ + respack + + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + + + + + Level3 + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + true + true + + + + + + + + + \ No newline at end of file diff --git a/aegisub/build/msbuild/respack/respack.vcxproj.filters b/aegisub/build/msbuild/respack/respack.vcxproj.filters new file mode 100644 index 000000000..0b10fcfb9 --- /dev/null +++ b/aegisub/build/msbuild/respack/respack.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/aegisub/build/msbuild/userconfig/readme.txt b/aegisub/build/msbuild/userconfig/readme.txt new file mode 100644 index 000000000..d345c98ce --- /dev/null +++ b/aegisub/build/msbuild/userconfig/readme.txt @@ -0,0 +1,29 @@ +You can put MSBuild property files in this folder to override the default +build configuration for Aegisub's build system. + +There is one configuration you almost guaranteed will want to override, +this is for the location of wxWidgets. Here is an example of a property +file that specifies a wxWidgets location: + +-------------- mywx.props -------------- + + + + + G:\Dev\wxWidgets-2.9\install-vc10 + + $(WxBasePath)\lib32 + $(WxBasePath)\lib64 + + $(WxBasePath)\include + + +---------------------------------------- + +You should not check files placed in this folder into source control. + +Files must be named *.props to be used. diff --git a/aegisub/build/msbuild/wx.props b/aegisub/build/msbuild/wx.props new file mode 100644 index 000000000..33790dfb9 --- /dev/null +++ b/aegisub/build/msbuild/wx.props @@ -0,0 +1,37 @@ + + + + + d + + wxbase29u$(WxLibDbgSuffix) + wxmsw29u$(WxLibDbgSuffix) + + + + + $(WxLibraryPath)\mswu$(WxLibDbgSuffix)\;$(WxIncludePath);$(IncludePath) + $(WxLibraryPath);$(LibraryPath) + + + + + + + $(WxLibBase).lib; + $(WxLibBase)_net.lib; + $(WxLibBase)_xml.lib; + $(WxLibMsw)_core.lib; + $(WxLibMsw)_adv.lib; + $(WxLibMsw)_gl.lib; + $(WxLibMsw)_stc.lib; + wxscintilla$(WxLibDbgSuffix).lib; + wxzlib$(WxLibDbgSuffix).lib; + wxexpat$(WxLibDbgSuffix).lib; + wxregexu$(WxLibDbgSuffix).lib; + wxpng$(WxLibDbgSuffix).lib; + %(AdditionalDependencies) + + + +