From 8a6093daf9aef603ab95ec87b3af4f699168374f Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 25 Feb 2013 17:47:38 +0000 Subject: [PATCH] Incluindo construção dos .def para msvc no processo de compilação windows, adicionando .def gerados no instalador do sdk --- configure.ac | 3 +++ po/pt_BR.po | 5 ++--- pw3270.nsi.in | 3 +++ src/lib3270/Makefile.in | 4 ++-- src/plugins/remotectl/Makefile.in | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 26042ad..88b00de 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ EXEEXT="" DLLPREFIX="lib" PLUGINS="" APP_GUI_SRC="" +LDLIBFLAGS="" if test $host != $build; then AC_CHECK_PROGS(HOST_CC, gcc cc) @@ -122,6 +123,7 @@ case "$host" in DLL_FLAGS="-shared -Wl,--add-stdcall-alias" LDSOFLAGS="-Wl,-soname,\`basename \$@\`" LDAPPFLAGS="-mwindows" + LDLIBFLAGS="-Wl,--output-def,\$@.def" DBGRPATH="" DLLDIR="" DBGCMDPREFIX="" @@ -315,6 +317,7 @@ AC_SUBST(DLL_CFLAGS) AC_SUBST(DLLDIR) AC_SUBST(LDSOFLAGS) AC_SUBST(LDAPPFLAGS) +AC_SUBST(LDLIBFLAGS) AC_SUBST(DBGRPATH) AC_SUBST(DBGCMDPREFIX) AC_SUBST(LDARCH) diff --git a/po/pt_BR.po b/po/pt_BR.po index 0a08854..ff3d778 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-25 08:36-0300\n" -"PO-Revision-Date: 2013-02-25 08:31-0300\n" +"POT-Creation-Date: 2013-02-25 14:45-0300\n" +"PO-Revision-Date: 2013-02-25 14:46-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" "Language: pt_BR\n" @@ -243,7 +243,6 @@ msgid "Auto-Reconnect" msgstr "Reconectar automaticamente" #: filetransfer.c:782 -#, fuzzy msgid "Avblock" msgstr "Avblock" diff --git a/pw3270.nsi.in b/pw3270.nsi.in index 568f53a..05c466b 100644 --- a/pw3270.nsi.in +++ b/pw3270.nsi.in @@ -163,6 +163,9 @@ Section /o "Software Development Kit" SecSDK file "/oname=$INSTDIR\sdk\sample\Makefile" "src\sample\Makefile" file "/oname=$INSTDIR\sdk\sample\connect.c" "src\sample\connect.c" + file "/oname=$INSTDIR\sdk\lib3270.def" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@.def" + file "/oname=$INSTDIR\sdk\libhllapi.def" ".bin\Release\libhllapi.dll.def" + SectionEnd # create a section to define what the uninstaller does. diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index a597085..f98466d 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -125,7 +125,7 @@ $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ $(BINDBG)/@DLLPREFIX@3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ -o $@ $^ $(LIBS) + @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ @rm -f $@ @@ -134,7 +134,7 @@ $(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ -o $@ $^ $(LIBS) + @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) @$(STRIP) $@ $(BINDBG)/testprogram$(EXEEXT): $(OBJDBG)/testprogram.o $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) diff --git a/src/plugins/remotectl/Makefile.in b/src/plugins/remotectl/Makefile.in index f3c67f6..cf8a55e 100644 --- a/src/plugins/remotectl/Makefile.in +++ b/src/plugins/remotectl/Makefile.in @@ -108,7 +108,7 @@ $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@: $(foreach SRC, $(basename $(PLUGIN_SRC $(BINRLS)/libhllapi@DLLEXT@: $(foreach SRC, $(basename $(HLLAPI_SRC)), $(OBJRLS)/$(SRC).o) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) + @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @LDLIBFLAGS@ -o $@ $^ $(LIBS) #---[ Debug targets ]---------------------------------------------------------- @@ -122,7 +122,7 @@ $(BINDBG)/plugins/$(MODULE_NAME)@DLLEXT@: $(foreach SRC, $(basename $(PLUGIN_SRC $(BINDBG)/libhllapi@DLLEXT@: $(foreach SRC, $(basename $(HLLAPI_SRC)), $(OBJDBG)/$(SRC).o) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) + @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @LDLIBFLAGS@ -o $@ $^ $(LIBS) #---[ Misc targets ]----------------------------------------------------------- -- libgit2 0.21.2