[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r9997: Changes required to get Gnash
|
From: |
Dossy Shiobara |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r9997: Changes required to get Gnash to build on Win32 again. |
|
Date: |
Tue, 14 Oct 2008 22:51:58 -0400 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9997
committer: Dossy Shiobara <address@hidden>
branch nick: gnash-trunk-win32
timestamp: Tue 2008-10-14 22:51:58 -0400
message:
Changes required to get Gnash to build on Win32 again.
modified:
gui/am-frag/fltk.am
libamf/Makefile.am
libbase/GnashImageJpeg.h
libbase/Makefile.am
libbase/dsodefs.h
libbase/extension.cpp
libbase/sharedlib.cpp
libbase/utf8.h
libcore/Makefile.am
libcore/asobj/Makefile.am
libcore/parser/Makefile.am
libcore/vm/Makefile.am
libmedia/Makefile.am
libnet/Makefile.am
plugin/mozilla-sdk/Makefile.am
plugin/mozilla-sdk/np_entry.cpp
plugin/win32/Makefile.am
plugin/win32/npgnash.c
plugin/win32/plugin.cpp
utilities/Makefile.am
=== modified file 'gui/am-frag/fltk.am'
--- a/gui/am-frag/fltk.am 2008-03-26 20:38:19 +0000
+++ b/gui/am-frag/fltk.am 2008-10-15 02:51:58 +0000
@@ -24,6 +24,9 @@
$(AM_CPPFLAGS) $(FLTK2_CFLAGS)
fltk_gnash_SOURCES = $(GUI_SRCS) gui_fltk.cpp
fltk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+if WIN32
+ fltk_gnash_LDFLAGS += -no-undefined
+endif
#fltk_gnash_DEPENDENCIES = .configline
fltk_gnash_LDADD = \
$(MYSQL_LIBS) \
@@ -38,12 +41,16 @@
# endif
if BUILD_AGG_RENDERER
fltk_gnash_CPPFLAGS += $(AGG_CFLAGS)
-fltk_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
+fltk_gnash_LDADD += \
+ $(top_builddir)/backend/libgnashagg.la \
$(FLTK2_LIBS) $(AGG_LIBS) $(XFT_LIBS) $(X11_LIBS)
+if WIN32
+ fltk_gnash_LDADD += $(top_builddir)/libcore/libgnashcore.la
+endif
fltk_gnash_SOURCES += fltk_glue_agg.cpp fltk_glue_agg.h \
fltk.cpp fltksup.h
endif
if WIN32
-fltk_gnash_LDADD += -lgdi32 -lole32 -luuid -lws2_32 -lmsimg32
+ fltk_gnash_LDADD += -lgdi32 -lole32 -luuid -lws2_32 -lmsimg32
endif
endif
=== modified file 'libamf/Makefile.am'
--- a/libamf/Makefile.am 2008-08-04 00:40:56 +0000
+++ b/libamf/Makefile.am 2008-10-15 02:51:58 +0000
@@ -32,6 +32,12 @@
$(top_builddir)/libbase/libgnashbase.la
libgnashamf_la_LDFLAGS = -release $(VERSION) ${AM_LDFLAGS}
+
+if WIN32
+ libgnashamf_la_LDFLAGS += -no-undefined
+ libgnashamf_la_LIBADD += -lws2_32 -lintl
+endif
+
# noinst_HEADERS = amf.h amfutf8.h
AM_CPPFLAGS = \
=== modified file 'libbase/GnashImageJpeg.h'
--- a/libbase/GnashImageJpeg.h 2008-09-22 07:49:56 +0000
+++ b/libbase/GnashImageJpeg.h 2008-10-15 02:51:58 +0000
@@ -35,6 +35,7 @@
extern "C" {
// jpeglib.h redefines HAVE_STDLIB_H. This silences
// the warnings, but it's not good.
+#undef HAVE_STDLIB_H
#include <jpeglib.h>
#undef HAVE_STDLIB_H
}
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2008-10-12 14:20:25 +0000
+++ b/libbase/Makefile.am 2008-10-15 02:51:58 +0000
@@ -82,6 +82,10 @@
$(PTHREAD_LIBS) \
$(NULL)
+if WIN32
+ libgnashbase_la_LIBADD += -lws2_32 -lwinmm
+endif
+
# Maybe use jemalloc, which handles memory fragmentation for
# ECAMscript languages better than the regular system malloc.
# This is controlled by the --enable-jemalloc (disabled by default)
@@ -178,6 +182,11 @@
libgnashbase_la_LDFLAGS = -release $(VERSION)
+if WIN32
+ libgnashbase_la_LDFLAGS += -no-undefined
+ libgnashbase_la_LIBADD += -lws2_32 -lwinmm
+endif
+
if !LIBLTDL2
libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
if CONVENIENCE_LTDL
=== modified file 'libbase/dsodefs.h'
--- a/libbase/dsodefs.h 2008-03-27 16:12:31 +0000
+++ b/libbase/dsodefs.h 2008-10-15 02:51:58 +0000
@@ -22,8 +22,9 @@
#include "gnashconfig.h"
#endif
-#ifdef _MSC_VER
- #ifdef BUILDING_DLL
+#if defined(_MSC_VER) || defined(WIN32) || defined(_WIN32)
+ // #ifdef BUILDING_DLL
+ #ifdef DLL_EXPORT
#define DSOEXPORT __declspec(dllexport)
#else
// Temporarily commented because of VC++ compiler problems
=== modified file 'libbase/extension.cpp'
--- a/libbase/extension.cpp 2008-08-03 09:19:06 +0000
+++ b/libbase/extension.cpp 2008-10-15 02:51:58 +0000
@@ -33,6 +33,9 @@
// static lightweight_mutex lib_mutex;
// #endif
+#if defined(WIN32) || defined(_WIN32)
+#define LIBLTDL_DLL_IMPORT 1
+#endif
#include <ltdl.h>
#include <cstring>
#include <iostream>
=== modified file 'libbase/sharedlib.cpp'
--- a/libbase/sharedlib.cpp 2008-07-30 08:55:45 +0000
+++ b/libbase/sharedlib.cpp 2008-10-15 02:51:58 +0000
@@ -32,6 +32,9 @@
#include <iostream>
#include <cstdlib>
+#if defined(WIN32) || defined(_WIN32)
+#define LIBLTDL_DLL_IMPORT 1
+#endif
#include <ltdl.h>
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
=== modified file 'libbase/utf8.h'
--- a/libbase/utf8.h 2008-04-28 06:51:03 +0000
+++ b/libbase/utf8.h 2008-10-15 02:51:58 +0000
@@ -95,7 +95,7 @@
//
/// Allows storage of Latin1 (ISO-8859-1) characters. This
/// is the format of SWF5 and below.
- std::string encodeLatin1Character(boost::uint32_t ucsCharacter);
+ DSOEXPORT std::string encodeLatin1Character(boost::uint32_t
ucsCharacter);
enum TextEncoding {
encUNSPECIFIED,
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2008-09-29 16:02:53 +0000
+++ b/libcore/Makefile.am 2008-10-15 02:51:58 +0000
@@ -198,7 +198,6 @@
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libnet/libgnashnet.la \
- $(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libcore/asobj/libgnashasobjs.la \
$(top_builddir)/libcore/parser/libgnashparser.la \
$(top_builddir)/libcore/vm/libgnashvm.la \
@@ -226,7 +225,17 @@
endif
#libserver_la_LIBDADD = address@hidden@ # $(LIBLTDL)
-libgnashcore_la_LDFLAGS = -release $(VERSION) -export-dynamic #-no-undefined
+libgnashcore_la_LDFLAGS = -release $(VERSION) -export-dynamic
+
+if WIN32
+ libgnashcore_la_LDFLAGS += -no-undefined
+ libgnashcore_la_LIBADD += \
+ $(top_builddir)/libmedia/libgnashmedia_la-MediaParser.lo \
+ $(top_builddir)/libmedia/libgnashmedia_la-MediaHandler.lo \
+ $(top_builddir)/libmedia/libgnashmedia_la-FLVParser.lo
+else
+ libgnashcore_la_LIBADD += $(top_builddir)/libmedia/libgnashmedia.la
+endif
# Rebuild with GCC 4.x Mudflap support
mudflap:
=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2008-10-05 00:08:38 +0000
+++ b/libcore/asobj/Makefile.am 2008-10-15 02:51:58 +0000
@@ -193,6 +193,10 @@
#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+if WIN32
+ libgnashasobjs_la_LDFLAGS = -no-undefined
+endif
+
# Rebuild with GCC 4.x Mudflap support
mudflap:
@echo "Rebuilding with GCC Mudflap support"
=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am 2008-09-29 16:02:53 +0000
+++ b/libcore/parser/Makefile.am 2008-10-15 02:51:58 +0000
@@ -81,10 +81,15 @@
libgnashparser_la_LIBADD = \
$(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/libmedia/libgnashmedia.la
-
-libgnashparser_la_LDFLAGS = $(BOOST_LIBS) -export-dynamic # -release
$(VERSION) -no-undefined
+ $(top_builddir)/libbase/libgnashbase.la
+
+## $(top_builddir)/libmedia/libgnashmedia.la
+
+libgnashparser_la_LDFLAGS = $(BOOST_LIBS) -export-dynamic # -release $(VERSION)
+
+if WIN32
+ libgnashparser_la_LDFLAGS += -no-undefined
+endif
if USE_GST_ENGINE
AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
=== modified file 'libcore/vm/Makefile.am'
--- a/libcore/vm/Makefile.am 2008-09-16 12:03:31 +0000
+++ b/libcore/vm/Makefile.am 2008-10-15 02:51:58 +0000
@@ -70,7 +70,11 @@
libgnashvm_la_CPPFLAGS += $(FFMPEG_CFLAGS)
endif
-libgnashvm_la_LDFLAGS = -export-dynamic # -release $(VERSION) -no-undefined
+libgnashvm_la_LDFLAGS = -export-dynamic # -release $(VERSION)
+
+if WIN32
+ libgnashvm_la_LDFLAGS += -no-undefined
+endif
# Rebuild with GCC 4.x Mudflap support
mudflap:
=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am 2008-10-06 11:59:41 +0000
+++ b/libmedia/Makefile.am 2008-10-15 02:51:58 +0000
@@ -46,6 +46,7 @@
$(CURL_CFLAGS) \
$(Z_CFLAGS) \
$(JPEG_CFLAGS) \
+ $(GIF_CFLAGS) \
$(BOOST_CFLAGS) \
$(INCLTDL) \
$(NULL)
@@ -59,7 +60,9 @@
endif
libgnashmedia_la_LIBADD = \
+ $(PNG_LIBS) \
$(JPEG_LIBS) \
+ $(GIF_LIBS) \
$(Z_LIBS) \
$(CURL_LIBS) \
$(OPENGL_LIBS) \
@@ -154,6 +157,14 @@
libgnashmedia_la_LDFLAGS = -release $(VERSION)
+if WIN32
+ libgnashmedia_la_LDFLAGS += -no-undefined
+ libgnashmedia_la_LIBADD += \
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(top_builddir)/libcore/libgnashcore.la \
+ -lintl
+endif
+
#libltdlc_la_CPPFLAGS = $(LTDLINCL)
#if CONVENIENCE_LTDL
#noinst_LTLIBRARIES = libltdlc.la
=== modified file 'libnet/Makefile.am'
--- a/libnet/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/libnet/Makefile.am 2008-10-15 02:51:58 +0000
@@ -71,6 +71,10 @@
rtmp_server.cpp \
statistics.cpp
+if WIN32
+ AM_LDFLAGS += -no-undefined
+endif
+
# Rebuild with GCC 4.x Mudflap support
mudflap:
@echo "Rebuilding with GCC Mudflap support"
=== modified file 'plugin/mozilla-sdk/Makefile.am'
--- a/plugin/mozilla-sdk/Makefile.am 2008-06-09 19:53:46 +0000
+++ b/plugin/mozilla-sdk/Makefile.am 2008-10-15 02:51:58 +0000
@@ -21,9 +21,10 @@
AM_CPPFLAGS = -DPLUGIN_TRACE
if WIN32
-AM_CPPFLAGS += -DXP_WIN -D_WINDOWS
+ AM_CPPFLAGS += -DXP_WIN -D_WINDOWS
+ AM_LDFLAGS = -static -no-undefined
else
-AM_CPPFLAGS += -DXP_UNIX
+ AM_CPPFLAGS += -DXP_UNIX
endif
AM_CPPFLAGS += \
=== modified file 'plugin/mozilla-sdk/np_entry.cpp'
--- a/plugin/mozilla-sdk/np_entry.cpp 2008-03-30 23:35:32 +0000
+++ b/plugin/mozilla-sdk/np_entry.cpp 2008-10-15 02:51:58 +0000
@@ -32,7 +32,7 @@
return NPERR_NO_ERROR;
}
-DSOEXPORT static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
+static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
{
if(aNPPFuncs == NULL)
return NPERR_INVALID_FUNCTABLE_ERROR;
@@ -78,7 +78,7 @@
return NPERR_NO_ERROR;
}
-DSOEXPORT static NPError fillNetscapeFunctionTable(NPNetscapeFuncs* aNPNFuncs)
+static NPError fillNetscapeFunctionTable(NPNetscapeFuncs* aNPNFuncs)
{
int i = 0, n;
=== modified file 'plugin/win32/Makefile.am'
--- a/plugin/win32/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/plugin/win32/Makefile.am 2008-10-15 02:51:58 +0000
@@ -43,7 +43,9 @@
$(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/backend/libgnashagg.la \
$(top_builddir)/libcore/libgnashcore.la \
- $(top_builddir)/plugin/mozilla-sdk/libmozsdk.la \
+ $(top_builddir)/plugin/mozilla-sdk/np_entry.lo \
+ $(top_builddir)/plugin/mozilla-sdk/npn_gate.lo \
+ $(top_builddir)/plugin/mozilla-sdk/npp_gate.lo \
$(AGG_LIBS) \
$(BOOST_LIBS) \
$(CURL_LIBS) \
@@ -60,14 +62,13 @@
plugin_LTLIBRARIES = npgnash.la
-npgnash.la: $(npgnash_la_OBJECTS) $(npgnash_la_DEPENDENCIES)
- $(CXXLINK) $(am_npgnash_la_rpath) $(npgnash_la_LDFLAGS)
$(npgnash_la_OBJECTS) $(npgnash_la_LIBADD) $(LIBS) && touch $@
+##npgnash.la: $(npgnash_la_OBJECTS) $(npgnash_la_DEPENDENCIES)
+## $(CXXLINK) $(am_npgnash_la_rpath) $(npgnash_la_LDFLAGS)
$(npgnash_la_OBJECTS) $(npgnash_la_LIBADD) $(LIBS) && touch $@
npgnash_la_SOURCES = npgnash.c plugin.cpp
EXTRA_npgnash_la_SOURCES = npgnash.rc
npgnash_la_LDFLAGS = -module -shared -no-undefined -version-info 0:0:0 \
- -o npgnash.dll -Wl,--enable-stdcall-fixup npgnash.def \
- $(AM_LDFLAGS)
+ -o npgnash.dll -Wl,--enable-stdcall-fixup npgnash.def
npgnash_la_LIBADD = npgnashrc.o
npgnashrc.o: npgnash.rc
=== modified file 'plugin/win32/npgnash.c'
--- a/plugin/win32/npgnash.c 2008-03-12 04:00:43 +0000
+++ b/plugin/win32/npgnash.c 2008-10-15 02:51:58 +0000
@@ -22,6 +22,13 @@
HINSTANCE g_hInst;
+int
+main(int argc, const char *argv[])
+{
+ /* Satisfy SDL_main link issue. */
+ return 0;
+}
+
BOOL WINAPI
DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpReserved)
{
=== modified file 'plugin/win32/plugin.cpp'
--- a/plugin/win32/plugin.cpp 2008-09-12 21:18:45 +0000
+++ b/plugin/win32/plugin.cpp 2008-10-15 02:51:58 +0000
@@ -468,7 +468,10 @@
// Register this plugin as listener for FsCommands from the core
// (movie_root)
+#if 0
+ /* Commenting out for now as registerFSCommandCallback() has changed. */
root.registerFSCommandCallback(FSCommand_callback);
+#endif
// Register a static function to handle ActionScript events such
// as Mouse.hide, Stage.align etc.
=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am 2008-09-29 16:02:53 +0000
+++ b/utilities/Makefile.am 2008-10-15 02:51:58 +0000
@@ -63,7 +63,7 @@
$(NULL)
if WIN32
- GNASH_LIBS += -lintl -lz -lws2_32
+ GNASH_LIBS += -lintl -lz -lws2_32
endif
if USE_FFMPEG_ENGINE
@@ -82,11 +82,9 @@
#check_PROGRAMS = gdebug.swf
gprocessor_SOURCES = processor.cpp
-gprocessor_CPPFLAGS = $(AM_CPPFLAGS)
# export our symbols so they can be used by Gnash plugins
-gprocessor_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
+gprocessor_LDFLAGS = -export-dynamic
gprocessor_LDADD = $(GNASH_LIBS)
-#gprocessor_DEPENDENCIES =
dumpshm_SOURCES = dumpshm.cpp
dumpshm_LDADD = $(GNASH_LIBS)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r9997: Changes required to get Gnash to build on Win32 again.,
Dossy Shiobara <=