From 36d9a3c490cf54743f4faecb016e422420f89daa Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 8 May 2014 14:44:12 -0700 Subject: [PATCH] Add msbuild build system for fribidi Thankfully the release tarball comes with pre-built versions of the generated files. --- build/Aegisub/standard-libraries.props | 1 - build/fribidi/fribidi-config.h | 20 +++++ build/fribidi/fribidi.vcxproj | 119 +++++++------------------ build/icu/icu.vcxproj | 6 +- 4 files changed, 56 insertions(+), 90 deletions(-) create mode 100644 build/fribidi/fribidi-config.h diff --git a/build/Aegisub/standard-libraries.props b/build/Aegisub/standard-libraries.props index 545ccca95..5617fab53 100644 --- a/build/Aegisub/standard-libraries.props +++ b/build/Aegisub/standard-libraries.props @@ -15,7 +15,6 @@ advapi32.lib; wsock32.lib; opengl32.lib; - fribidi.lib; %(AdditionalDependencies) diff --git a/build/fribidi/fribidi-config.h b/build/fribidi/fribidi-config.h new file mode 100644 index 000000000..0ecbd28e2 --- /dev/null +++ b/build/fribidi/fribidi-config.h @@ -0,0 +1,20 @@ +#ifndef FRIBIDI_CONFIG_H +#define FRIBIDI_CONFIG_H + +#define FRIBIDI "fribidi" +#define FRIBIDI_NAME "GNU FriBidi" +#define FRIBIDI_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?product=fribidi" + +#define FRIBIDI_VERSION "0.19.6" +#define FRIBIDI_MAJOR_VERSION 0 +#define FRIBIDI_MINOR_VERSION 19 +#define FRIBIDI_MICRO_VERSION 6 +#define FRIBIDI_INTERFACE_VERSION 3 +#define FRIBIDI_INTERFACE_VERSION_STRING "3" + +#define FRIBIDI_CHARSETS 0 +#define FRIBIDI_USE_GLIB 0 +#define FRIBIDI_SIZEOF_INT 4 + +#define HAVE_STRINGIZE 1 +#endif diff --git a/build/fribidi/fribidi.vcxproj b/build/fribidi/fribidi.vcxproj index bf545bd1f..0922c9121 100644 --- a/build/fribidi/fribidi.vcxproj +++ b/build/fribidi/fribidi.vcxproj @@ -2,8 +2,8 @@ {FB8E8D19-A4D6-4181-943C-282075F49B41} - MakeFileProj - Makefile + fribidi + lib @@ -11,10 +11,26 @@ + + + + + $(FribidiSrcDir)\lib; + $(MSBuildThisFileDirectory); + %(AdditionalIncludeDirectories) + + + FRIBIDI_ENTRY=; + %(PreprocessorDefinitions) + + + + @@ -25,90 +41,21 @@ /> - - - -nologo -DFRIBIDI_ENTRY=\"\" - --enable-debug CFLAGS="-MDd $(Cflags)" - --disable-debug CFLAGS="-MD $(Cflags)" - - --enable-static - --disable-shared - --disable-dependency-tracking - --without-glib - $(CfgDebug) - - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)$(FribidiSrcDir)')) - - + - - - + + + + + + + + + + + + + fribidi\ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/icu/icu.vcxproj b/build/icu/icu.vcxproj index 2d22fc159..ed257f10d 100644 --- a/build/icu/icu.vcxproj +++ b/build/icu/icu.vcxproj @@ -356,7 +356,7 @@ - unicode + unicode\ @@ -681,7 +681,7 @@ - unicode + unicode\ @@ -689,4 +689,4 @@ {fcaed410-90ef-4ef9-916c-4b86dc13a3cf} - \ No newline at end of file +