Commit 8a6093daf9aef603ab95ec87b3af4f699168374f
1 parent
30ead0b8
Exists in
master
and in
5 other branches
Incluindo construção dos .def para msvc no processo de compilação windows, adici…
…onando .def gerados no instalador do sdk
Showing
5 changed files
with
12 additions
and
7 deletions
Show diff stats
configure.ac
| ... | ... | @@ -103,6 +103,7 @@ EXEEXT="" |
| 103 | 103 | DLLPREFIX="lib" |
| 104 | 104 | PLUGINS="" |
| 105 | 105 | APP_GUI_SRC="" |
| 106 | +LDLIBFLAGS="" | |
| 106 | 107 | |
| 107 | 108 | if test $host != $build; then |
| 108 | 109 | AC_CHECK_PROGS(HOST_CC, gcc cc) |
| ... | ... | @@ -122,6 +123,7 @@ case "$host" in |
| 122 | 123 | DLL_FLAGS="-shared -Wl,--add-stdcall-alias" |
| 123 | 124 | LDSOFLAGS="-Wl,-soname,\`basename \$@\`" |
| 124 | 125 | LDAPPFLAGS="-mwindows" |
| 126 | + LDLIBFLAGS="-Wl,--output-def,\$@.def" | |
| 125 | 127 | DBGRPATH="" |
| 126 | 128 | DLLDIR="" |
| 127 | 129 | DBGCMDPREFIX="" |
| ... | ... | @@ -315,6 +317,7 @@ AC_SUBST(DLL_CFLAGS) |
| 315 | 317 | AC_SUBST(DLLDIR) |
| 316 | 318 | AC_SUBST(LDSOFLAGS) |
| 317 | 319 | AC_SUBST(LDAPPFLAGS) |
| 320 | +AC_SUBST(LDLIBFLAGS) | |
| 318 | 321 | AC_SUBST(DBGRPATH) |
| 319 | 322 | AC_SUBST(DBGCMDPREFIX) |
| 320 | 323 | AC_SUBST(LDARCH) | ... | ... |
po/pt_BR.po
| ... | ... | @@ -5,8 +5,8 @@ msgid "" |
| 5 | 5 | msgstr "" |
| 6 | 6 | "Project-Id-Version: pw3270 5.0\n" |
| 7 | 7 | "Report-Msgid-Bugs-To: \n" |
| 8 | -"POT-Creation-Date: 2013-02-25 08:36-0300\n" | |
| 9 | -"PO-Revision-Date: 2013-02-25 08:31-0300\n" | |
| 8 | +"POT-Creation-Date: 2013-02-25 14:45-0300\n" | |
| 9 | +"PO-Revision-Date: 2013-02-25 14:46-0300\n" | |
| 10 | 10 | "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" |
| 11 | 11 | "Language-Team: Português <>\n" |
| 12 | 12 | "Language: pt_BR\n" |
| ... | ... | @@ -243,7 +243,6 @@ msgid "Auto-Reconnect" |
| 243 | 243 | msgstr "Reconectar automaticamente" |
| 244 | 244 | |
| 245 | 245 | #: filetransfer.c:782 |
| 246 | -#, fuzzy | |
| 247 | 246 | msgid "Avblock" |
| 248 | 247 | msgstr "Avblock" |
| 249 | 248 | ... | ... |
pw3270.nsi.in
| ... | ... | @@ -163,6 +163,9 @@ Section /o "Software Development Kit" SecSDK |
| 163 | 163 | file "/oname=$INSTDIR\sdk\sample\Makefile" "src\sample\Makefile" |
| 164 | 164 | file "/oname=$INSTDIR\sdk\sample\connect.c" "src\sample\connect.c" |
| 165 | 165 | |
| 166 | + file "/oname=$INSTDIR\sdk\lib3270.def" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@.def" | |
| 167 | + file "/oname=$INSTDIR\sdk\libhllapi.def" ".bin\Release\libhllapi.dll.def" | |
| 168 | + | |
| 166 | 169 | SectionEnd |
| 167 | 170 | |
| 168 | 171 | # create a section to define what the uninstaller does. | ... | ... |
src/lib3270/Makefile.in
| ... | ... | @@ -125,7 +125,7 @@ $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ |
| 125 | 125 | $(BINDBG)/@DLLPREFIX@3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) |
| 126 | 126 | @echo " CCLD `basename $@`" |
| 127 | 127 | @$(MKDIR) `dirname $@` |
| 128 | - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ -o $@ $^ $(LIBS) | |
| 128 | + @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) | |
| 129 | 129 | |
| 130 | 130 | $(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ |
| 131 | 131 | @rm -f $@ |
| ... | ... | @@ -134,7 +134,7 @@ $(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ |
| 134 | 134 | $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) |
| 135 | 135 | @echo " CCLD `basename $@`" |
| 136 | 136 | @$(MKDIR) `dirname $@` |
| 137 | - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ -o $@ $^ $(LIBS) | |
| 137 | + @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) | |
| 138 | 138 | @$(STRIP) $@ |
| 139 | 139 | |
| 140 | 140 | $(BINDBG)/testprogram$(EXEEXT): $(OBJDBG)/testprogram.o $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) | ... | ... |
src/plugins/remotectl/Makefile.in
| ... | ... | @@ -108,7 +108,7 @@ $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@: $(foreach SRC, $(basename $(PLUGIN_SRC |
| 108 | 108 | $(BINRLS)/libhllapi@DLLEXT@: $(foreach SRC, $(basename $(HLLAPI_SRC)), $(OBJRLS)/$(SRC).o) |
| 109 | 109 | @echo " CCLD `basename $@`" |
| 110 | 110 | @$(MKDIR) `dirname $@` |
| 111 | - @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) | |
| 111 | + @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @LDLIBFLAGS@ -o $@ $^ $(LIBS) | |
| 112 | 112 | |
| 113 | 113 | #---[ Debug targets ]---------------------------------------------------------- |
| 114 | 114 | |
| ... | ... | @@ -122,7 +122,7 @@ $(BINDBG)/plugins/$(MODULE_NAME)@DLLEXT@: $(foreach SRC, $(basename $(PLUGIN_SRC |
| 122 | 122 | $(BINDBG)/libhllapi@DLLEXT@: $(foreach SRC, $(basename $(HLLAPI_SRC)), $(OBJDBG)/$(SRC).o) |
| 123 | 123 | @echo " CCLD `basename $@`" |
| 124 | 124 | @$(MKDIR) `dirname $@` |
| 125 | - @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) | |
| 125 | + @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @LDLIBFLAGS@ -o $@ $^ $(LIBS) | |
| 126 | 126 | |
| 127 | 127 | #---[ Misc targets ]----------------------------------------------------------- |
| 128 | 128 | ... | ... |