diff --git a/[priyesh]ChangeLog b/[priyesh]ChangeLog index 6c2c256ec..2b3b21269 100644 --- a/[priyesh]ChangeLog +++ b/[priyesh]ChangeLog @@ -1,4 +1,27 @@ -2020-07-22 Priyesh Kumar +2020-07-30 Priyesh Kumar + + Added a Visual Studios project to build dlg along with FreeType on Windows. + + * builds/windows/dlg/dlg.{vcxproj, vcxproj.filters}: New files. + + * builds/windows/dlg/script.bat: New Batch File. It is called as a pre- + built event while building dlg to copy files from `submodules/dlg' to + `src/dlg'. + + * builds/windows/vc2010/freetype.sln: Added a subproject to build `dlg' + for `Debug' and `Debug Static' Configurations in `Win32' and `x64' + platforms. + + * builds/windows/vc2010/freetype.vcxproj (AdditionalIncludeDirectories): + Added dlg's include files for all configurations and platforms. + (AdditionalDependencies): Added `dlg.lib' as a dependency for `Debug` + configuration of FreeType on both platforms. + (PreprocessorDefinitions): Added `DLG_STATIC' for `Debug Static' + configuration on bot platforms. + + * [priyesh]ChangeLog: Fix date. + +2020-07-28 Priyesh Kumar Merging master branch with current branch(priyeshLogLibrary) diff --git a/builds/windows/dlg/dlg.vcxproj b/builds/windows/dlg/dlg.vcxproj new file mode 100644 index 000000000..39e99958c --- /dev/null +++ b/builds/windows/dlg/dlg.vcxproj @@ -0,0 +1,165 @@ + + + + + Debug Static + Win32 + + + Debug Static + x64 + + + Debug + Win32 + + + Debug + x64 + + + + 16.0 + Win32Proj + {f15a5e7b-f721-4d61-9573-19aee9177027} + dlg + 10.0 + + + + DynamicLibrary + true + v142 + Unicode + + + StaticLibrary + true + v142 + Unicode + + + DynamicLibrary + true + v142 + Unicode + + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + + + + + + + + + + + + + + + + + + + + + true + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + dlg + + + true + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + dlg + + + true + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + dlg + + + true + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + dlg + + + + Level3 + true + _WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\..\src\dlg\ + + + Console + true + + + call $(ProjectDir)script.bat + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE%(PreprocessorDefinitions) + true + ..\..\..\src\dlg\ + + + Console + true + + + call $(ProjectDir)script.bat + + + + + Level3 + true + _WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\..\src\dlg\ + + + Console + true + + + call $(ProjectDir)script.bat + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\..\src\dlg\ + + + Console + true + + + call $(ProjectDir)script.bat + + + + + + + + + \ No newline at end of file diff --git a/builds/windows/dlg/dlg.vcxproj.filters b/builds/windows/dlg/dlg.vcxproj.filters new file mode 100644 index 000000000..6dd51d95f --- /dev/null +++ b/builds/windows/dlg/dlg.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;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/builds/windows/dlg/script.bat b/builds/windows/dlg/script.bat new file mode 100644 index 000000000..a6f973a33 --- /dev/null +++ b/builds/windows/dlg/script.bat @@ -0,0 +1,11 @@ +@echo OFF + +:: Move to Top Dir +cd ..\..\..\ + +:: Copy dlg's files from `submodules\dlg' to `src\dlg' +IF NOT EXIST src\dlg\dlg ( + mkdir src\dlg\dlg + COPY submodules\dlg\include\dlg\dlg.h src\dlg\dlg + COPY submodules\dlg\include\dlg\output.h src\dlg\dlg + COPY submodules\dlg\src\dlg\dlg.c src\dlg\ ) \ No newline at end of file diff --git a/builds/windows/vc2010/freetype.sln b/builds/windows/vc2010/freetype.sln index 8698207a9..b82230581 100644 --- a/builds/windows/vc2010/freetype.sln +++ b/builds/windows/vc2010/freetype.sln @@ -1,37 +1,60 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio Express 2012 for Windows Desktop +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30204.135 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlg", "..\dlg\dlg.vcxproj", "{F15A5E7B-F721-4D61-9573-19AEE9177027}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 Debug Static|Win32 = Debug Static|Win32 Debug Static|x64 = Debug Static|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release Static|Win32 = Release Static|Win32 Release Static|x64 = Release Static|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|Win32.ActiveCfg = Debug Static|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|Win32.Build.0 = Debug Static|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.ActiveCfg = Debug Static|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.Build.0 = Debug Static|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|Win32.ActiveCfg = Release Static|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|Win32.Build.0 = Release Static|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.ActiveCfg = Release Static|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.Build.0 = Release Static|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug Static|Win32.ActiveCfg = Debug Static|Win32 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug Static|Win32.Build.0 = Debug Static|Win32 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug Static|x64.ActiveCfg = Debug Static|x64 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug Static|x64.Build.0 = Debug Static|x64 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug|Win32.ActiveCfg = Debug|Win32 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug|Win32.Build.0 = Debug|Win32 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug|x64.ActiveCfg = Debug|x64 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug|x64.Build.0 = Debug|x64 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release Static|Win32.ActiveCfg = Debug Static|Win32 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release Static|Win32.Build.0 = Debug Static|Win32 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release Static|x64.ActiveCfg = Debug Static|x64 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release Static|x64.Build.0 = Debug Static|x64 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release|Win32.ActiveCfg = Debug Static|Win32 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release|Win32.Build.0 = Debug Static|Win32 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release|x64.ActiveCfg = Debug Static|x64 + {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release|x64.Build.0 = Debug Static|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B6413C29-83EB-4BBE-9598-1A96E37515D1} + EndGlobalSection EndGlobal diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index d61eeec5f..f7220438e 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -89,7 +89,7 @@ Disabled - $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + ..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -111,11 +111,15 @@ $(UserLibraryDirectories);%(AdditionalLibraryDirectories) $(UserDependencies);%(AdditionalDependencies) + + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + dlg.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) + Disabled - $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + ..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -137,11 +141,15 @@ $(UserLibraryDirectories);%(AdditionalLibraryDirectories) $(UserDependencies);%(AdditionalDependencies) + + ..\..\..\objs\$(Platform)\$(Configuration)\dlg\ + dlg.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) + Disabled - $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + ..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -167,8 +175,8 @@ Disabled - $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) + ..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -348,4 +356,4 @@ - + \ No newline at end of file