Build fix

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

diff --git a/src/Makefile.in b/src/Makefile.in
index 481eda7e0ecf18b56ff692c786f80f3f836d473e..a59f072d30794a28ff61f59addeb436570b5434e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -115,7 +115,6 @@ install::
          $(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
        @if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
          echo "  Copying shared library" ; \
          $(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
        @if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
          echo "  Copying shared library" ; \

-          @cd $(WXBASEDIR)/src ; \

            rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
            $(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
            rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
            $(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 386977884a78e719fe823af5e9ce083001c0cf57..0a7d12ab7bbb36ea96d814a9a53672bf23ecd53a 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -80,12 +80,12 @@
 
 #define _MAXPATHLEN 500
 
 
 #define _MAXPATHLEN 500
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
-#endif
-   

 extern char *wxBuffer;
 
 extern char *wxBuffer;
 

+#if !USE_SHARED_LIBRARIES
+IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
+#endif
+

 void wxPathList::Add (const wxString& path)
 {
   wxStringList::Add ((char *)(const char *)path);
 void wxPathList::Add (const wxString& path)
 {
   wxStringList::Add ((char *)(const char *)path);

diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp
index 22aa99fae9ffe676aee6fe96519e009e8149a09a..2b0148e877ccec395c7ac83d85d536e31cf76ad7 100644 (file)
--- a/src/common/postscrp.cpp
+++ b/src/common/postscrp.cpp
@@ -2553,6 +2553,14 @@ wxPrintPaperType::~wxPrintPaperType()
   delete[] pageName;
 }
 
   delete[] pageName;
 }
 

+/*
+ * Print paper database for PostScript
+ */
+
+#if !USE_SHARED_LIBRARIES
+IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
+#endif
+

 wxPrintPaperDatabase::wxPrintPaperDatabase():wxList(wxKEY_STRING)
 {
   DeleteContents(TRUE);
 wxPrintPaperDatabase::wxPrintPaperDatabase():wxList(wxKEY_STRING)
 {
   DeleteContents(TRUE);

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index d709a7cb6d6ffc5b0adee94bccca6525ac49e784..4868df9b6e7863f41fe6f5e626dff3356accc242 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -849,7 +849,14 @@ void wxExpr::WriteLispExpr(ostream& stream)
   }
 }
 
   }
 }
 

-// wxExpr 'database' (list of expressions)
+/*
+ * wxExpr 'database' (list of expressions)
+ */
+ 
+#if !USE_SHARED_LIBRARIES
+IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
+#endif
+

 wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
 {
   position = NULL;
 wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
 {
   position = NULL;