mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mingw build of mythes with system hunspell

Browse Source
This commit is contained in:
David Tardon
2012-02-18 14:07:27 +01:00
parent 55892c6bd7
commit ad3b8a779d
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mythes/makefile.mk
View File

@@ -46,15 +46,15 @@ PATCH_FILES=\
mythes-1.2.0-makefile-mk.diff \ mythes-1.2.0-makefile-mk.diff \
mythes-1.2.0-android.patch mythes-1.2.0-android.patch
.IF "$(GUI)"=="UNX" .IF "$(COM)"=="GCC"
CONFIGURE_DIR=$(BUILD_DIR)
.IF "$(SYSTEM_MYTHES)" != "YES"
.IF "$(SYSTEM_HUNSPELL)" != "YES" .IF "$(SYSTEM_HUNSPELL)" != "YES"
HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.3 HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.3
.ENDIF .ENDIF
.ENDIF
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
#relative to CONFIGURE_DIR #relative to CONFIGURE_DIR
# still needed also in system-mythes case as it creates the makefile # still needed also in system-mythes case as it creates the makefile
@@ -86,17 +86,15 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff
BUILD_ACTION=make BUILD_ACTION=make
OUT2INC += mythes.hxx OUT2INC += mythes.hxx
.ENDIF
.ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(GUI)"=="UNX"
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
.IF "$(SYSTEM_MYTHES)" != "YES"
CONFIGURE_ACTION=configure CONFIGURE_ACTION=configure
CONFIGURE_FLAGS= --disable-shared --with-pic \ CONFIGURE_FLAGS= --disable-shared --with-pic \
HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \ HUNSPELL_CFLAGS="$(HUNSPELL_CFLAGS)" \
HUNSPELL_LIBS="-L$(SOLARLIBDIR) -lhunspell-1.3" HUNSPELL_LIBS="$(HUNSPELL_LIBS)"
.IF "$(CROSS_COMPILING)"=="YES" .IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
@@ -104,7 +102,6 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff
BUILD_ACTION=make BUILD_ACTION=make
.ENDIF
.ELSE .ELSE
BUILD_ACTION=dmake BUILD_ACTION=dmake
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"