Download as
Browse Code »

Commit 52d358a4d7865817556c994ad5f6d1a2dcd16f0f

Authored by Perry Werneck
1 parent a345930b
Exists in master and in 1 other branch develop

Fixing windows builds.

Showing 1 changed file with 1 additions and 2 deletions   Show diff stats
@@ -78,7 +78,6 @@ case "$host" in @@ -78,7 +78,6 @@ case "$host" in
78 78
79 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" 79 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
80 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" 80 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
81 - LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"  
82 DLLEXT=".dll" 81 DLLEXT=".dll"
83 82
84 app_win32_revision=$(date +%-y.%-m.%-d.%-H) 83 app_win32_revision=$(date +%-y.%-m.%-d.%-H)
@@ -108,7 +107,6 @@ AC_SUBST(LIBS) @@ -108,7 +107,6 @@ AC_SUBST(LIBS)
108 AC_SUBST(LOGDIR) 107 AC_SUBST(LOGDIR)
109 AC_SUBST(DLLEXT) 108 AC_SUBST(DLLEXT)
110 AC_SUBST(DLLPREFIX) 109 AC_SUBST(DLLPREFIX)
111 -AC_SUBST(STATIC_LDFLAGS)  
112 AC_SUBST(LDFLAGS) 110 AC_SUBST(LDFLAGS)
113 111
114 dnl --------------------------------------------------------------------------- 112 dnl ---------------------------------------------------------------------------
@@ -224,6 +222,7 @@ if test "$app_cv_static_ipc3270" == "auto"; then @@ -224,6 +222,7 @@ if test "$app_cv_static_ipc3270" == "auto"; then
224 fi 222 fi
225 223
226 if test "$app_cv_static_ipc3270" == "yes"; then 224 if test "$app_cv_static_ipc3270" == "yes"; then
  225 + LDFLAGS="-static -static-libgcc -static-libstdc++ $LDFLAGS"
227 PKG_CHECK_MODULES( [IPC3270], [ipc3270-static], AC_DEFINE(USING_STATIC_IPC3270), AC_MSG_ERROR([IPC3270 not present.])) 226 PKG_CHECK_MODULES( [IPC3270], [ipc3270-static], AC_DEFINE(USING_STATIC_IPC3270), AC_MSG_ERROR([IPC3270 not present.]))
228 else 227 else
229 PKG_CHECK_MODULES( [IPC3270], [ipc3270], AC_DEFINE(USING_SHARED_IPC3270), AC_MSG_ERROR([IPC3270 not present.])) 228 PKG_CHECK_MODULES( [IPC3270], [ipc3270], AC_DEFINE(USING_SHARED_IPC3270), AC_MSG_ERROR([IPC3270 not present.]))