Download as
Browse Code »

Commit fe12279945bdeb979f5bd211c0ed6a858578a61c

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

Creating files required for windows SDK package.

Showing 2 changed files with 33 additions and 4 deletions   Show diff stats
Makefile.in
  Diff comments   View file @fe12279
... ... @@ -69,6 +69,7 @@ CONVERT=@CONVERT@
69 69 OPTIPNG=@OPTIPNG@
70 70 ZIP=@ZIP@
71 71 DOXYGEN=@DOXYGEN@
  72 +DLLTOOL=@DLLTOOL@
72 73  
73 74 #---[ Paths ]----------------------------------------------------------------------------
74 75  
... ... @@ -204,7 +205,7 @@ $(BINRLS)/$(LIBNAME).delayed.a: \
204 205 @$(MKDIR) $(dir $@)
205 206 @echo $< ...
206 207  
207   - @@DLLTOOL@ \
  208 + @$(DLLTOOL) \
208 209 --input-def $(BINRLS)/$(LIBNAME).def \
209 210 --dllname $(LIBNAME).dll \
210 211 --kill-at \
... ... @@ -276,12 +277,16 @@ install-delayed: \
276 277 $(BINRLS)/$(LIBNAME).delayed.a
277 278  
278 279 # Install static library
279   - @$(MKDIR) $(DESTDIR)$(libdir)
  280 + @$(MKDIR) \
  281 + $(DESTDIR)$(libdir)
  282 +
280 283 @$(INSTALL_DATA) \
281 284 $(BINRLS)/$(LIBNAME).delayed.a \
282 285 $(DESTDIR)$(libdir)
283 286  
284   - @$(MKDIR) $(DESTDIR)$(libdir)/pkgconfig
  287 + @$(MKDIR) \
  288 + $(DESTDIR)$(libdir)/pkgconfig
  289 +
285 290 @$(INSTALL_DATA) \
286 291 sdk/lib3270-delayed.pc \
287 292 $(DESTDIR)$(libdir)/pkgconfig/lib3270-delayed.pc
... ... @@ -309,6 +314,29 @@ install-dev: \
309 314 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
310 315 @$(INSTALL_DATA) $(POTDIR)/lib3270.pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/lib3270.pot
311 316  
  317 +
  318 +install-winlib: \
  319 + $(BINRLS)/$(SONAME)
  320 +
  321 + @$(MKDIR) \
  322 + $(DESTDIR)$(libdir)
  323 +
  324 + @$(INSTALL_DATA) \
  325 + $(BINRLS)/$(LIBNAME).dll.a \
  326 + $(DESTDIR)$(libdir)
  327 +
  328 + @$(DLLTOOL) \
  329 + --input-def $(BINRLS)/$(LIBNAME).def \
  330 + --dllname $(LIBNAME).dll \
  331 + --output-lib $(DESTDIR)$(libdir)/$(LIBNAME).lib
  332 +
  333 + @$(MKDIR) \
  334 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  335 +
  336 + @$(INSTALL_DATA) \
  337 + $(BINRLS)/$(LIBNAME).def \
  338 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  339 +
312 340 #---[ Misc Targets ]---------------------------------------------------------------------
313 341  
314 342 $(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c: \
... ...
configure.ac
  Diff comments   View file @fe12279
... ... @@ -82,8 +82,9 @@ case &quot;$host&quot; in
82 82 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
83 83 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
84 84 LDFLAGS="$LDFLAGS -pthread"
85   - DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def"
  85 + DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).dll.a"
86 86 DLLEXT=".dll"
  87 + INSTALL_PACKAGES="${INSTALL_PACKAGES} winlib"
87 88  
88 89 app_win32_revision=$(date +%-y.%-m.%-d.%-H)
89 90 AC_SUBST(WIN32_VERSION,$app_win32_revision)
... ...