diff --git a/configure.ac b/configure.ac index 917a6c8..55f080b 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,9 @@ case "$host" in CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600" LIBS="$LIBS -lws2_32 -lwtsapi32 -lintl -lcomdlg32" - HLLAPI_LDFLAGS="-static-libstdc++ -static-libgcc" + + dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw + STATIC_LDFLAGS="-static-libstdc++ -static-libgcc" AC_CONFIG_FILES(win/makeruntime.sh) AC_CONFIG_FILES(win/copydeps.sh) @@ -115,7 +117,7 @@ case "$host" in AC_SUBST(PROGRAMFILES,$app_cv_programfiles) AC_SUBST(WINARCH,$app_cv_winarch) - AC_SUBST(HLLAPI_LDFLAGS) + AC_SUBST(STATIC_LDFLAGS) ;; diff --git a/locale/pw3270.pot b/locale/pw3270.pot index b1eeeeb..7990fba 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-31 16:15-0300\n" +"POT-Creation-Date: 2017-07-31 17:31-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-31 16:15-0300\n" +"POT-Creation-Date: 2017-07-31 17:31-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/plugins/hllapi/Makefile.in b/src/plugins/hllapi/Makefile.in index 4fa4ab5..c08e795 100644 --- a/src/plugins/hllapi/Makefile.in +++ b/src/plugins/hllapi/Makefile.in @@ -185,7 +185,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ -shared \ -Wl,-soname,`basename $@` \ -L$(BASEDIR)/.bin/Release \ - @HLLAPI_LDFLAGS@ \ + @STATIC_LDFLAGS@ \ -o $@ $^ \ $(API_LIBS) diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in index ed87690..85e53d9 100644 --- a/win/pw3270.nsi.in +++ b/win/pw3270.nsi.in @@ -134,6 +134,7 @@ SubSection "@PACKAGE@" SecMain CreateDirectory "$INSTDIR\plugins" file "/oname=$INSTDIR\plugins\hllapi.dll" "..\.bin\Release\plugins\hllapi.dll" file "/oname=$SYSDIR\libhllapi.dll" "..\.bin\Release\libhllapi.dll.@PACKAGE_VERSION@" + file "/oname=$SYSDIR\libwinpthread-1.dll" "..\.bin\runtime\libwinpthread-1.dll" sectionEnd -- libgit2 0.21.2