diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-06-02 01:05:16 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-06-02 23:38:00 +0200 |
| commit | a9f170c1045e642bfbd22fc323b635a4870e2d07 (patch) | |
| tree | 0617b56c39931fdf48c3fc7f5e7c4942e15f534a | |
| parent | 1c4605d1e07a6264ef8bdac556fff575c2bd6e2d (diff) | |
twain header is only for Windows
Change-Id: I7b1cee3bde17fc9e52b7fcf06d1d5215a9396814
| -rw-r--r-- | Module_tail_build.mk | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | extensions/Library_scn.mk | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 02a7d43273f2..719a6e6b202d 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -112,9 +112,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ test \ toolkit \ tools \ - $(if $(filter TWAIN,$(BUILD_TYPE)),\ - twain \ - ) \ + twain \ ucb \ unixODBC \ UnoControls \ diff --git a/configure.in b/configure.in index 04df9819cfa6..32332662c433 100644 --- a/configure.in +++ b/configure.in @@ -2524,10 +2524,6 @@ dnl =================================================================== dnl Windows specific tests and stuff dnl =================================================================== if test "$_os" = "WINNT"; then - - dnl Include twain scanners - BUILD_TYPE="$BUILD_TYPE TWAIN" - dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice. AC_MSG_CHECKING([whether to build a 64-bit LibreOffice]) if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 2942b2b0eeba..1a884a6a8bec 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn)) $(eval $(call gb_Library_use_packages,scn,\ sane_inc \ - twain_inc \ )) $(eval $(call gb_Library_use_api,scn,\ @@ -57,6 +56,8 @@ $(eval $(call gb_Library_add_exception_objects,scn,\ )) ifeq ($(GUI),WNT) +$(eval $(call gb_Library_use_packages,scn,twain_inc)) + $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scanwin \ )) |