[X2Go-Commits] page changed: wiki:development:build-howto-mswin:x2goclient

[wiki-admin at x2go.org]

A page in your DokuWiki was added or changed. Here are the details:

Date        : 2015/02/22 14:46
Browser     : Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.111 Safari/537.36
IP-Address  : 71.175.97.130
Hostname    : pool-71-175-97-130.phlapa.fios.verizon.net
Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient?rev=1424480262
New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient
Edit Summary: [Building nxproxy] Workarounds for libpng15
User        : mikedep333

@@ -365,8 +365,43 @@
  $ wget http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.27-lite.tar.gz
  $ tar -xvzf nx-libs-3.5.0.27-lite.tar.gz
  $ cd nx-libs-3.5.0.27
  </code>
+ 
+ Fix building with libpng15:
+ <code>
+ diff --git a/Pgn.cpp.orig b/Pgn.cpp
+ index cdcde84..1f56787 100644
+ --- a/nxcomp/Pgn.cpp.orig
+ +++ b/nxcomp/Pgn.cpp
+ @@ -28,7 +28,7 @@
+  #endif
+  #include <unistd.h>
+  #include
<stdio.h>
+ -#include <png.h>
+ +#include <libpng15/png.h>
+ 
+  #include "Unpack.h"
+  #include "Pgn.h"
+ 
+ </code>
+ <code>
+ diff --git a/configure.in.orig b/configure.in
+ index 6fa9757..b0699bb 100644
+ --- a/nxcomp/configure.in.orig
+ +++ b/nxcomp/configure.in
+ @@ -385,7 +385,7 @@ AC_SUBST(ALL)
+ 
+  if test "$CYGWIN32" = yes; then
+      ALL="\$(LIBCYGARCHIVE) \$(LIBCYGSHARED) \$(LIBARCHIVE)"
+ -    LIBS="-lstdc++ -lpng -ljpeg -lz"
+ +    LIBS="-lstdc++ -lpng15 -ljpeg -lz"
+  else
+      ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)"
+  fi
+ 
+ </code>
+ 
    * Build nxcomp
  <code>
  $ cd nxcomp
  $ autoconf



-- 
This mail was generated by DokuWiki at
http://wiki.x2go.org/