Some fixes for Solaris (2.5).

Fixed path to png.h in gdk_imlib_private.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/app.h b/include/wx/app.h
index 349bac1acf1f4e27865fea4d89b906b400238795..e4fd1864864b9a5ae810d91a47cf6c0a11bacbf9 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -51,7 +51,7 @@ public:
 // (e.g. hello.cpp).
 // Now IMPLEMENT_APP should add this code if required.
 
 // (e.g. hello.cpp).
 // Now IMPLEMENT_APP should add this code if required.
 

-#if defined(__AIX__) || defined(__SUN__) || defined(__HPUX__)
+#if defined(__AIX__) || defined(__HPUX__)

 #define IMPLEMENT_WXWIN_MAIN \
 extern int wxEntry( int argc, char *argv[] ); \
 int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
 #define IMPLEMENT_WXWIN_MAIN \
 extern int wxEntry( int argc, char *argv[] ); \
 int main(int argc, char *argv[]) { return wxEntry(argc, argv); }

diff --git a/src/gdk_imlib/gdk_imlib_private.h b/src/gdk_imlib/gdk_imlib_private.h
index 3da5c6d9bb72fb01a0cf69d0959a7b5ef3102cb9..e105f30cbee92968ee9ad023e07abf2c07b9a5ab 100644 (file)
--- a/src/gdk_imlib/gdk_imlib_private.h
+++ b/src/gdk_imlib/gdk_imlib_private.h
@@ -47,7 +47,7 @@
 #include <jpeglib.h>
 #endif
 #ifdef HAVE_LIBPNG
 #include <jpeglib.h>
 #endif
 #ifdef HAVE_LIBPNG

-#include <png.h>
+#include <../png/png.h>

 #endif
 #ifdef HAVE_LIBTIFF
 #include <tiffio.h>
 #endif
 #ifdef HAVE_LIBTIFF
 #include <tiffio.h>

diff --git a/src/gtk/threadpsx.cpp b/src/gtk/threadpsx.cpp
index 688ef8f29f473d0bcbd41b92900ce5dafb79873c..80613c5156c3cdf24ae0640e9abb1320887eaebb 100644 (file)
--- a/src/gtk/threadpsx.cpp
+++ b/src/gtk/threadpsx.cpp
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <sched.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <sched.h>
 #include <pthread.h>

+#include <errno.h>

 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"

diff --git a/src/gtk1/threadpsx.cpp b/src/gtk1/threadpsx.cpp
index 688ef8f29f473d0bcbd41b92900ce5dafb79873c..80613c5156c3cdf24ae0640e9abb1320887eaebb 100644 (file)
--- a/src/gtk1/threadpsx.cpp
+++ b/src/gtk1/threadpsx.cpp
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <sched.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <sched.h>
 #include <pthread.h>

+#include <errno.h>

 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"

diff --git a/user/wxLayout/Makefile b/user/wxLayout/Makefile
new file mode 100644 (file)
index 0000000..027d82a
--- /dev/null
+++ b/user/wxLayout/Makefile
@@ -0,0 +1 @@
+include ../../src/gtk/setup/general/makeapp