diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-10-05 22:44:53 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-10-05 22:45:03 +0200 |
| commit | 858751d723f350c741ab2658b6de48117f2aac2a (patch) | |
| tree | 91c0f9d2376a042760edc9b62839a1f92e50ba57 /lcms2 | |
| parent | e80f565c3886f8bc87b03d43acbb1453f7edcc48 (diff) | |
It seems that the VS2008 files are only maintained in the VS2008 directory
Change-Id: I6fcb0a9045b81ea291904f92396df88ffd351c49
Diffstat (limited to 'lcms2')
| -rw-r--r-- | lcms2/lcms2-2.4-windows.patch | 44 | ||||
| -rw-r--r-- | lcms2/lcms2-windows-export.patch | 18 | ||||
| -rw-r--r-- | lcms2/makefile.mk | 5 |
3 files changed, 47 insertions, 20 deletions
diff --git a/lcms2/lcms2-2.4-windows.patch b/lcms2/lcms2-2.4-windows.patch new file mode 100644 index 000000000000..f1c681aee7f2 --- /dev/null +++ b/lcms2/lcms2-2.4-windows.patch @@ -0,0 +1,44 @@ +--- misc/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-09-10 18:01:51.000000000 +0200 ++++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-10-05 22:35:01.607191700 +0200 +@@ -205,6 +205,10 @@ + > + </File> + <File ++ RelativePath="..\..\..\src\cmshalf.c" ++ > ++ </File> ++ <File + RelativePath="..\..\..\src\cmsintrp.c" + > + </File> +--- misc/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-09-10 18:01:51.000000000 +0200 ++++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-10-05 22:35:28.168963200 +0200 +@@ -175,6 +175,10 @@ + > + </File> + <File ++ RelativePath="..\..\..\src\cmshalf.c" ++ > ++ </File> ++ <File + RelativePath="..\..\..\src\cmsintrp.c" + > + </File> +--- misc/lcms2-2.4/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100 ++++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 +@@ -192,6 +192,15 @@ typedef int cmsBool; + # endif + #endif + ++// LibreOffice always builds this as DLL and with the stdcall calling ++// convention, so make this usable from outside without having to ++// specify CMS_DLL manually whenever the library is used. ++#ifndef CMS_DLL_BUILD ++#ifndef CMS_DLL ++#define CMS_DLL ++#endif ++#endif ++ + // Calling convention -- this is hardly platform and compiler dependent + #ifdef CMS_IS_WINDOWS_ + # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/lcms2/lcms2-windows-export.patch b/lcms2/lcms2-windows-export.patch deleted file mode 100644 index 1a77c64f308e..000000000000 --- a/lcms2/lcms2-windows-export.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- misc/build/lcms2-2.4/include/lcms2.h.sav 2011-12-15 16:45:47.000000000 +0100 -+++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 -@@ -192,6 +192,15 @@ typedef int cmsBool; - # endif - #endif - -+// LibreOffice always builds this as DLL and with the stdcall calling -+// convention, so make this usable from outside without having to -+// specify CMS_DLL manually whenever the library is used. -+#ifndef CMS_DLL_BUILD -+#ifndef CMS_DLL -+#define CMS_DLL -+#endif -+#endif -+ - // Calling convention -- this is hardly platform and compiler dependent - #ifdef CMS_IS_WINDOWS_ - # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 62a9ff9f9576..a87ac10e5f89 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -48,16 +48,17 @@ PATCH_FILES = lcms2.patch .IF "$(GUI)$(COM)"=="WNTMSC" -PATCH_FILES += lcms2-windows-export.patch +PATCH_FILES += lcms2-2.4-windows.patch CONFIGURE_DIR=. CONFIGURE_ACTION = -BUILD_DIR=Projects/VC2010/lcms2_DLL .IF "$(CCNUMVER)" >= "001600000000" +BUILD_DIR=Projects/VC2010/lcms2_DLL BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 .ELSE +BUILD_DIR=Projects/VC2008/lcms2_DLL BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" .ENDIF |