diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1c6eae0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +* text=auto +include/** linguist-vendored +lib/** linguist-vendored +freetype/** linguist-vendored diff --git a/.gitignore b/.gitignore index 03938c2..cebfdda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,14 @@ Debug/ Release/ +Release OpenMP/ Debug Library/ Release Library/ +Release Library OpenMP/ x86/ x64/ .vs/ *.exe +*.zip *.user *.sdf *.pdb diff --git a/Msdfgen.sln b/Msdfgen.sln index 22bc005..19d35c0 100644 --- a/Msdfgen.sln +++ b/Msdfgen.sln @@ -11,8 +11,12 @@ Global Debug Library|x86 = Debug Library|x86 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release Library OpenMP|x64 = Release Library OpenMP|x64 + Release Library OpenMP|x86 = Release Library OpenMP|x86 Release Library|x64 = Release Library|x64 Release Library|x86 = Release Library|x86 + Release OpenMP|x64 = Release OpenMP|x64 + Release OpenMP|x86 = Release OpenMP|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection @@ -25,10 +29,18 @@ Global {84BE2D91-F071-4151-BE12-61460464C494}.Debug|x64.Build.0 = Debug|x64 {84BE2D91-F071-4151-BE12-61460464C494}.Debug|x86.ActiveCfg = Debug|Win32 {84BE2D91-F071-4151-BE12-61460464C494}.Debug|x86.Build.0 = Debug|Win32 + {84BE2D91-F071-4151-BE12-61460464C494}.Release Library OpenMP|x64.ActiveCfg = Release Library OpenMP|x64 + {84BE2D91-F071-4151-BE12-61460464C494}.Release Library OpenMP|x64.Build.0 = Release Library OpenMP|x64 + {84BE2D91-F071-4151-BE12-61460464C494}.Release Library OpenMP|x86.ActiveCfg = Release Library OpenMP|Win32 + {84BE2D91-F071-4151-BE12-61460464C494}.Release Library OpenMP|x86.Build.0 = Release Library OpenMP|Win32 {84BE2D91-F071-4151-BE12-61460464C494}.Release Library|x64.ActiveCfg = Release Library|x64 {84BE2D91-F071-4151-BE12-61460464C494}.Release Library|x64.Build.0 = Release Library|x64 {84BE2D91-F071-4151-BE12-61460464C494}.Release Library|x86.ActiveCfg = Release Library|Win32 {84BE2D91-F071-4151-BE12-61460464C494}.Release Library|x86.Build.0 = Release Library|Win32 + {84BE2D91-F071-4151-BE12-61460464C494}.Release OpenMP|x64.ActiveCfg = Release OpenMP|x64 + {84BE2D91-F071-4151-BE12-61460464C494}.Release OpenMP|x64.Build.0 = Release OpenMP|x64 + {84BE2D91-F071-4151-BE12-61460464C494}.Release OpenMP|x86.ActiveCfg = Release OpenMP|Win32 + {84BE2D91-F071-4151-BE12-61460464C494}.Release OpenMP|x86.Build.0 = Release OpenMP|Win32 {84BE2D91-F071-4151-BE12-61460464C494}.Release|x64.ActiveCfg = Release|x64 {84BE2D91-F071-4151-BE12-61460464C494}.Release|x64.Build.0 = Release|x64 {84BE2D91-F071-4151-BE12-61460464C494}.Release|x86.ActiveCfg = Release|Win32 diff --git a/Msdfgen.vcxproj b/Msdfgen.vcxproj index 423a69f..5b6cc73 100644 --- a/Msdfgen.vcxproj +++ b/Msdfgen.vcxproj @@ -13,6 +13,14 @@ Debug Win32 + + Release Library OpenMP + Win32 + + + Release Library OpenMP + x64 + Release Library Win32 @@ -21,6 +29,14 @@ Release Library x64 + + Release OpenMP + Win32 + + + Release OpenMP + x64 + Release Win32 @@ -59,6 +75,13 @@ true MultiByte + + Application + false + v140 + true + MultiByte + StaticLibrary false @@ -66,6 +89,13 @@ true MultiByte + + StaticLibrary + false + v140 + true + MultiByte + Application true @@ -85,6 +115,13 @@ true MultiByte + + Application + false + v140 + true + MultiByte + StaticLibrary false @@ -92,6 +129,13 @@ true MultiByte + + StaticLibrary + false + v140 + true + MultiByte + @@ -106,9 +150,15 @@ + + + + + + @@ -118,9 +168,15 @@ + + + + + + msdfgen @@ -134,14 +190,26 @@ msdfgen bin\ + + msdfgen + $(Configuration)\ + msdfgen bin\ + + msdfgen + $(Configuration)\ + msdfgen $(Platform)\$(Configuration)\ + + msdfgen + $(Platform)\$(Configuration)\ + msdfgen $(Platform)\$(Configuration)\ @@ -150,6 +218,10 @@ msdfgen $(Platform)\$(Configuration)\ + + msdfgen + $(Platform)\$(Configuration)\ + msdfgen $(Platform)\$(Configuration)\ @@ -233,6 +305,26 @@ No + + + Level3 + MaxSpeed + true + true + true + MSDFGEN_STANDALONE;MSDFGEN_USE_CPP11;MSDFGEN_USE_OPENMP;%(PreprocessorDefinitions) + MultiThreaded + include;freetype/include;%(AdditionalIncludeDirectories) + true + + + true + true + Console + freetype/win32;%(AdditionalLibraryDirectories) + No + + Level3 @@ -256,6 +348,30 @@ freetype/win32;%(AdditionalLibraryDirectories) + + + Level3 + MaxSpeed + true + true + true + MSDFGEN_USE_CPP11;MSDFGEN_USE_OPENMP;%(PreprocessorDefinitions) + MultiThreaded + include;freetype/include;%(AdditionalIncludeDirectories) + true + + + true + true + Console + lib;%(AdditionalLibraryDirectories) + No + + + MachineX86 + freetype/win32;%(AdditionalLibraryDirectories) + + Level3 @@ -275,6 +391,26 @@ false + + + Level3 + MaxSpeed + true + true + true + include;freetype/include;%(AdditionalIncludeDirectories) + MSDFGEN_STANDALONE;MSDFGEN_USE_CPP11;MSDFGEN_USE_OPENMP;%(PreprocessorDefinitions) + MultiThreaded + true + + + true + true + Console + freetype/win64;%(AdditionalLibraryDirectories) + false + + Level3 @@ -294,6 +430,26 @@ freetype/win64;%(AdditionalLibraryDirectories) + + + Level3 + MaxSpeed + true + true + true + include;freetype/include;%(AdditionalIncludeDirectories) + MSDFGEN_USE_CPP11;MSDFGEN_USE_OPENMP;%(PreprocessorDefinitions) + MultiThreaded + true + + + true + true + + + freetype/win64;%(AdditionalLibraryDirectories) + +