[Gnash-commit] /srv/bzr/gnash/trunk r9544: * configure.ac: MinGW gcc 3.4.5 on Win32 won't build with -ansi,

[Dossy Shiobara]

------------------------------------------------------------
revno: 9544
committer: Dossy Shiobara <address@hidden>
branch nick: gnash-trunk-win32
timestamp: Tue 2008-07-29 18:26:53 -0400
message:
  * configure.ac: MinGW gcc 3.4.5 on Win32 won't build with -ansi,
    which undefines things like strdup, etc.
  
  * libbase/Makefile.am: Win32 builds fail when linking against
    libltdl.dll.a, as it's missing the lt_* symbols.  Need to look
    into this further, but in the meantime, this gets the build
    going again.
  
  * libbase/utility.h: address@hidden symbol in kernel32.dll
    needs to be defined outside of the gnash C++ namespace.
    Needless to say, this change is a fragile hack to get the
    build moving again.
  
  * libmedia/MediaParser.cpp: usleep() not available on Win32.
    This should probably go into utility.h or some other platform
    abstraction lib.
modified:
  ChangeLog
  configure.ac
  libbase/Makefile.am
  libbase/utility.h
  libmedia/MediaParser.cpp

=== modified file 'ChangeLog'
--- a/ChangeLog 2008-07-15 16:08:20 +0000
+++ b/ChangeLog 2008-07-29 22:26:53 +0000
@@ -1,3 +1,22 @@
+2008-07-29  Dossy Shiobara <address@hidden>
+
+       * configure.ac: MinGW gcc 3.4.5 on Win32 won't build with -ansi,
+         which undefines things like strdup, etc.
+
+       * libbase/Makefile.am: Win32 builds fail when linking against
+         libltdl.dll.a, as it's missing the lt_* symbols.  Need to look
+         into this further, but in the meantime, this gets the build
+         going again.
+
+       * libbase/utility.h: address@hidden symbol in kernel32.dll
+         needs to be defined outside of the gnash C++ namespace.
+         Needless to say, this change is a fragile hack to get the
+         build moving again.
+
+       * libmedia/MediaParser.cpp: usleep() not available on Win32.
+         This should probably go into utility.h or some other platform
+         abstraction lib.
+
 2008-06-26 Markus Gothe <address@hidden>
 
        * server/asobj/NetStreamGst.cpp: Make sure

=== modified file 'configure.ac'
--- a/configure.ac      2008-07-22 21:24:49 +0000
+++ b/configure.ac      2008-07-29 22:26:53 +0000
@@ -1925,8 +1925,8 @@
     -Wnon-virtual-dtor \
     -Wunused \
     -Wextra \   
-    -ansi \
     "
+    #-ansi \
   CFLAGS="$CFLAGS \
     -W \
     -Wall \

=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am       2008-07-22 21:24:49 +0000
+++ b/libbase/Makefile.am       2008-07-29 22:26:53 +0000
@@ -167,6 +167,10 @@
 libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
 libltdl_la_LIBADD = $(LIBADD_DL)
 
+if WIN32
+  libltdl_la_LDFLAGS += -static
+endif
+
 # Rebuild with GCC 4.x Mudflap support
 mudflap:
        @echo "Rebuilding with GCC Mudflap support"

=== modified file 'libbase/utility.h'
--- a/libbase/utility.h 2008-07-16 05:11:56 +0000
+++ b/libbase/utility.h 2008-07-29 22:26:53 +0000
@@ -204,9 +204,9 @@
 #include <pthread.h>
 #else
 # ifdef _WIN32
-extern "C" {
-    unsigned long int /* DWORD WINAPI */ GetCurrentThreadId(void);
-}
+} // end namespace gnash
+extern "C" unsigned long int /* DWORD WINAPI */ GetCurrentThreadId(void);
+namespace gnash {
 # else
 /* getpid() */
 #include <sys/types.h>

=== modified file 'libmedia/MediaParser.cpp'
--- a/libmedia/MediaParser.cpp  2008-07-11 13:16:39 +0000
+++ b/libmedia/MediaParser.cpp  2008-07-29 22:26:53 +0000
@@ -23,6 +23,11 @@
 
 #include <boost/bind.hpp>
 
+#ifdef _WIN32
+#include <windows.h>
+#define usleep(usec) ((void) Sleep((usec) / 1000))
+#endif
+
 namespace gnash {
 namespace media {