Download as
Browse Code »

Commit 8900318801ee46ac40d62f1a5b39acbf343dd8ac

Authored by perry.werneck@gmail.com
1 parent dcdd70a7
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustando configurações do libreoffice de acordo com o sistema operacional

Showing 2 changed files with 38 additions and 27 deletions   Show diff stats
@@ -496,29 +496,43 @@ AC_ARG_VAR([OFFICE_HOME], [Libreoffice home]) @@ -496,29 +496,43 @@ AC_ARG_VAR([OFFICE_HOME], [Libreoffice home])
496 AC_ARG_VAR([OO_SDK_HOME], [Libreoffice SDK home]) 496 AC_ARG_VAR([OO_SDK_HOME], [Libreoffice SDK home])
497 AC_ARG_VAR([OO_SDK_URE_HOME], [Libreoffice URE home]) 497 AC_ARG_VAR([OO_SDK_URE_HOME], [Libreoffice URE home])
498 498
499 -if test "_$OFFICE_HOME" == "_" ; then  
500 - if test "$host_cpu" = "x86_64"; then  
501 - OFFICE_HOME="/usr/lib64/libreoffice"  
502 - else  
503 - OFFICE_HOME="/usr/lib/libreoffice"  
504 - fi  
505 -fi 499 +case "$host" in
  500 + *-mingw32)
  501 + app_cv_office="no"
  502 + ;;
506 503
507 -if test "_$OO_SDK_HOME" == "_" ; then  
508 - OO_SDK_HOME=$OFFICE_HOME/sdk  
509 -fi 504 + *-apple-*)
  505 + app_cv_office="no"
  506 + ;;
510 507
511 -if test "_$OO_SDK_URE_HOME" == "_" ; then  
512 - if test -d $OFFICE_HOME/ure; then  
513 - OO_SDK_URE_HOME="$OFFICE_HOME/ure"  
514 - else  
515 - if test "$host_cpu" = "x86_64"; then  
516 - OO_SDK_URE_HOME="/usr/lib64/ure"  
517 - else  
518 - OO_SDK_URE_HOME="/usr/lib/ure" 508 + *)
  509 + OO_LDFLAGS="-luno_cppu -luno_cppuhelpergcc3 -luno_salhelpergcc3"
  510 +
  511 + if test "_$OFFICE_HOME" == "_" ; then
  512 + if test "$host_cpu" = "x86_64"; then
  513 + OFFICE_HOME="/usr/lib64/libreoffice"
  514 + else
  515 + OFFICE_HOME="/usr/lib/libreoffice"
  516 + fi
519 fi 517 fi
520 - fi  
521 -fi 518 +
  519 + if test "_$OO_SDK_HOME" == "_" ; then
  520 + OO_SDK_HOME=$OFFICE_HOME/sdk
  521 + fi
  522 +
  523 + if test "_$OO_SDK_URE_HOME" == "_" ; then
  524 + if test -d $OFFICE_HOME/ure; then
  525 + OO_SDK_URE_HOME="$OFFICE_HOME/ure"
  526 + else
  527 + if test "$host_cpu" = "x86_64"; then
  528 + OO_SDK_URE_HOME="/usr/lib64/ure"
  529 + else
  530 + OO_SDK_URE_HOME="/usr/lib/ure"
  531 + fi
  532 + fi
  533 + fi
  534 +
  535 +esac
522 536
523 # Setup c++ compiler flags 537 # Setup c++ compiler flags
524 if test -d "$prefix/include/libreoffice"; then 538 if test -d "$prefix/include/libreoffice"; then
@@ -604,6 +618,7 @@ AC_SUBST(OO_SDK_HOME) @@ -604,6 +618,7 @@ AC_SUBST(OO_SDK_HOME)
604 AC_SUBST(OO_SDK_URE_HOME) 618 AC_SUBST(OO_SDK_URE_HOME)
605 AC_SUBST(IDLDIR) 619 AC_SUBST(IDLDIR)
606 AC_SUBST(OO_CXXFLAGS) 620 AC_SUBST(OO_CXXFLAGS)
  621 +AC_SUBST(OO_LDFLAGS)
607 622
608 #--[ Pre-reqs ]----------------------------------------------------------------------------------------------------------------------------------------------- 623 #--[ Pre-reqs ]-----------------------------------------------------------------------------------------------------------------------------------------------
609 AC_SUBST(LIB3270_REQUIRES) 624 AC_SUBST(LIB3270_REQUIRES)
src/loffice/Makefile.in
  Diff comments   View file @8900318
@@ -88,16 +88,10 @@ include $(CLASSLIBDIR)/class.mak @@ -88,16 +88,10 @@ include $(CLASSLIBDIR)/class.mak
88 #---[ Build options ]---------------------------------------------------------- 88 #---[ Build options ]----------------------------------------------------------
89 89
90 CXXFLAGS=@CXXFLAGS@ @OO_CXXFLAGS@ -I../include -I./include -DLANGUAGE_BINDING_NAME=\"gcc3\" 90 CXXFLAGS=@CXXFLAGS@ @OO_CXXFLAGS@ -I../include -I./include -DLANGUAGE_BINDING_NAME=\"gcc3\"
91 -#  
92 -#CPPUENV="gcc3"  
93 -#CXXFLAGS=@CXXFLAGS@ -fvisibility=hidden @DLL_CFLAGS@ -Wno-strict-aliasing \  
94 -# -I../include -I./include -I$(includedir)/libreoffice \  
95 -# -DCPPU_ENV=$(CPPUENV) -DLANGUAGE_BINDING_NAME=\"$(CPPUENV)\"  
96 -#  
97 91
98 OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ 92 OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \
99 -Wl,-rpath-link=$(OO_SDK_URE_HOME)/lib,-rpath=$(OO_SDK_URE_HOME)/lib \ 93 -Wl,-rpath-link=$(OO_SDK_URE_HOME)/lib,-rpath=$(OO_SDK_URE_HOME)/lib \
100 - -luno_cppu -luno_cppuhelpergcc3 -luno_salhelpergcc3 94 + @OO_LDFLAGS@
101 95
102 #---[ Rules ]------------------------------------------------------------------ 96 #---[ Rules ]------------------------------------------------------------------
103 97
@@ -146,6 +140,8 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb @@ -146,6 +140,8 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb
146 140
147 #---[ Release targets ]-------------------------------------------------------- 141 #---[ Release targets ]--------------------------------------------------------
148 142
  143 +all: $(BINDIR)/$(PACKAGE_NAME).oxt
  144 +
149 Release: include/$(PACKAGE_NAME)/lib3270.hpp \ 145 Release: include/$(PACKAGE_NAME)/lib3270.hpp \
150 $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \ 146 $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \
151 $(RDBDIR)/$(PACKAGE_NAME).rdb \ 147 $(RDBDIR)/$(PACKAGE_NAME).rdb \