Download as
Browse Code »

Commit 4c0dc7b7077cc5c0e167febf4528e40f3d9e0f1f

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

Ajustes para evitar que DLLs destinadas ao diretório de sistema do windows carre… 

…guem dependências do MinGW
Showing 3 changed files with 24 additions and 9 deletions   Show diff stats
@@ -103,6 +103,7 @@ AC_SUBST(PACKAGE_LEVEL,"APP_LEVEL") @@ -103,6 +103,7 @@ AC_SUBST(PACKAGE_LEVEL,"APP_LEVEL")
103 103
104 DLL_CFLAGS="" 104 DLL_CFLAGS=""
105 DLL_FLAGS="-shared" 105 DLL_FLAGS="-shared"
  106 +SYSDLL_FLAGS="-shared"
106 SOCKET_LIBS="" 107 SOCKET_LIBS=""
107 LIB3270_REQUIRES="" 108 LIB3270_REQUIRES=""
108 109
@@ -131,6 +132,10 @@ case "$host" in @@ -131,6 +132,10 @@ case "$host" in
131 CFLAGS="$CFLAGS -mms-bitfields" 132 CFLAGS="$CFLAGS -mms-bitfields"
132 localedir="locale" 133 localedir="locale"
133 DLL_FLAGS="-shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup" 134 DLL_FLAGS="-shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup"
  135 +
  136 + # http://stackoverflow.com/questions/18138635/mingw-exe-requires-a-few-gcc-dlls-regardless-of-the-code
  137 + SYSDLL_FLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--add-stdcall-alias,--enable-stdcall-fixup"
  138 +
134 LDSOFLAGS="-Wl,-soname,\`basename \$@\`" 139 LDSOFLAGS="-Wl,-soname,\`basename \$@\`"
135 LDAPPFLAGS="-mwindows" 140 LDAPPFLAGS="-mwindows"
136 LDLIBFLAGS="-Wl,--output-def,\$@.def" 141 LDLIBFLAGS="-Wl,--output-def,\$@.def"
@@ -249,11 +254,19 @@ AC_ARG_ENABLE([pic], @@ -249,11 +254,19 @@ AC_ARG_ENABLE([pic],
249 [ 254 [
250 app_cv_pic="$enableval" 255 app_cv_pic="$enableval"
251 ],[ 256 ],[
252 - if test "$host_cpu" = "x86_64"; then 257 + case "$host-$host_cpu" in
  258 + *-mingw32-*)
  259 + app_cv_pic="no"
  260 + ;;
  261 +
  262 + *-x86_64)
253 app_cv_pic="yes" 263 app_cv_pic="yes"
254 - else 264 + ;;
  265 +
  266 + *)
255 app_cv_pic="no" 267 app_cv_pic="no"
256 - fi 268 + esac
  269 +
257 ]) 270 ])
258 271
259 AC_ARG_ENABLE([registry], 272 AC_ARG_ENABLE([registry],
@@ -394,6 +407,7 @@ AC_SUBST(PHPCONFIG) @@ -394,6 +407,7 @@ AC_SUBST(PHPCONFIG)
394 407
395 #--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- 408 #--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
396 409
  410 +AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable ooRexx plugin & extension])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ])
397 AC_ARG_VAR([REXX_HOME], [ooRexx home]) 411 AC_ARG_VAR([REXX_HOME], [ooRexx home])
398 412
399 if test -z "${REXX_HOME}"; then 413 if test -z "${REXX_HOME}"; then
@@ -406,7 +420,6 @@ if test -z "${REXX_HOME}"; then @@ -406,7 +420,6 @@ if test -z "${REXX_HOME}"; then
406 PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) ) 420 PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
407 421
408 if test "$REXXCONFIG" != "no"; then 422 if test "$REXXCONFIG" != "no"; then
409 - app_cv_rexx=yes  
410 REXX_CFLAGS=`$REXXCONFIG --cflags` 423 REXX_CFLAGS=`$REXXCONFIG --cflags`
411 REXX_LIBS=`$REXXCONFIG --libs` 424 REXX_LIBS=`$REXXCONFIG --libs`
412 REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx 425 REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
@@ -419,8 +432,6 @@ if test -z "${REXX_HOME}"; then @@ -419,8 +432,6 @@ if test -z "${REXX_HOME}"; then
419 else 432 else
420 if test -e "${REXX_HOME}/api/oorexxapi.h"; then 433 if test -e "${REXX_HOME}/api/oorexxapi.h"; then
421 434
422 - app_cv_rexx="yes"  
423 -  
424 AC_MSG_NOTICE([Setting rexx sdk from REXX_HOME]) 435 AC_MSG_NOTICE([Setting rexx sdk from REXX_HOME])
425 436
426 REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\"" 437 REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""
@@ -439,7 +450,9 @@ if test "$app_cv_rexx" == "yes"; then @@ -439,7 +450,9 @@ if test "$app_cv_rexx" == "yes"; then
439 AC_DEFINE(HAVE_REXX) 450 AC_DEFINE(HAVE_REXX)
440 AC_DEFINE(HAVE_OOREXXAPI_H) 451 AC_DEFINE(HAVE_OOREXXAPI_H)
441 PLUGINS="$PLUGINS rx3270" 452 PLUGINS="$PLUGINS rx3270"
442 - AC_MSG_NOTICE([Rexx plugin enabled.]) 453 + AC_MSG_NOTICE([ooRexx plugin & extension are enabled.])
  454 +else
  455 + AC_MSG_NOTICE([ooRexx is NOT present or disabled.])
443 fi 456 fi
444 457
445 AC_ARG_WITH([rexxlibdir], [AS_HELP_STRING([--with-rexxlibdir], [Path to rexx extension libs])], [ REXX_LIBDIR=$withval ],[ REXX_LIBDIR=$libdir ]) 458 AC_ARG_WITH([rexxlibdir], [AS_HELP_STRING([--with-rexxlibdir], [Path to rexx extension libs])], [ REXX_LIBDIR=$withval ],[ REXX_LIBDIR=$libdir ])
@@ -583,6 +596,7 @@ AC_SUBST(EXEEXT) @@ -583,6 +596,7 @@ AC_SUBST(EXEEXT)
583 AC_SUBST(DLLPREFIX) 596 AC_SUBST(DLLPREFIX)
584 AC_SUBST(DLLEXT) 597 AC_SUBST(DLLEXT)
585 AC_SUBST(DLL_FLAGS) 598 AC_SUBST(DLL_FLAGS)
  599 +AC_SUBST(SYSDLL_FLAGS)
586 AC_SUBST(DLL_CFLAGS) 600 AC_SUBST(DLL_CFLAGS)
587 AC_SUBST(DLLDIR) 601 AC_SUBST(DLLDIR)
588 AC_SUBST(LDSOFLAGS) 602 AC_SUBST(LDSOFLAGS)
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2014-04-11 15:48-0300\n" 8 +"POT-Creation-Date: 2014-04-12 07:51-0300\n"
9 "PO-Revision-Date: 2014-02-17 08:05-0300\n" 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Portugues <>\n" 11 "Language-Team: Portugues <>\n"
src/plugins/hllapi/Makefile.in
  Diff comments   View file @4c0dc7b
@@ -58,7 +58,8 @@ XGETTEXT=@XGETTEXT@ @@ -58,7 +58,8 @@ XGETTEXT=@XGETTEXT@
58 58
59 #---[ Rules ]------------------------------------------------------------------ 59 #---[ Rules ]------------------------------------------------------------------
60 60
61 -DLL_FLAGS=@DLL_FLAGS@ 61 +DLL_FLAGS=@SYSDLL_FLAGS@
  62 +
62 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall 63 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
63 64
64 LIB3270_MODE ?= Default 65 LIB3270_MODE ?= Default