Download as
Browse Code »

Commit d2eea719183fa852058da6c5fd9855d9e2297ba9

Authored by Perry Werneck
1 parent 3f423a3f
Exists in master and in 3 other branches develop, macos, network_module

Adding .def and .a files on windows builds.

Showing 3 changed files with 4 additions and 5 deletions   Show diff stats
@@ -80,7 +80,7 @@ case "$host" in @@ -80,7 +80,7 @@ case "$host" in
80 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" 80 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
81 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" 81 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
82 LDFLAGS="$LDFLAGS -pthread" 82 LDFLAGS="$LDFLAGS -pthread"
83 - DLL_LDFLAGS="-shared -Wl,--output-def,\$@.def" 83 + DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).a"
84 DLLEXT=".dll" 84 DLLEXT=".dll"
85 85
86 app_win32_revision=$(date +%y.%m.%d.%H) 86 app_win32_revision=$(date +%y.%m.%d.%H)
src/lib3270++/Makefile.in
  Diff comments   View file @d2eea71
@@ -201,12 +201,11 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ @@ -201,12 +201,11 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
201 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 201 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
202 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) 202 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
203 203
204 - @$(MKDIR) `dirname $@` 204 + @$(MKDIR) $(@D)
205 @echo $< ... 205 @echo $< ...
206 206
207 @$(LD) \ 207 @$(LD) \
208 - -shared \  
209 - -Wl,-soname,$(@F) \ 208 + @DLL_LDFLAGS@ \
210 -o $@ \ 209 -o $@ \
211 $(LDFLAGS) \ 210 $(LDFLAGS) \
212 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ 211 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \
src/lib3270/Makefile.in
  Diff comments   View file @d2eea71
@@ -202,7 +202,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ @@ -202,7 +202,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
202 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 202 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
203 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) 203 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
204 204
205 - @$(MKDIR) `dirname $@` 205 + @$(MKDIR) $(@D)
206 @echo $< ... 206 @echo $< ...
207 @$(LD) \ 207 @$(LD) \
208 @DLL_LDFLAGS@ \ 208 @DLL_LDFLAGS@ \