[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am config.mk.in backen...
|
From: |
Markus Gothe |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am config.mk.in backen... |
|
Date: |
Sun, 15 Oct 2006 09:11:21 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/15 09:11:21
Modified files:
. : ChangeLog Makefile.am config.mk.in
backend : sound_handler_mp3.cpp sound_handler_sdl.cpp
sound_handler_sdl.h
doc/C : internals.xml
gui : Makefile.am
libamf : Makefile.am
plugin : Makefile.am
plugin/klash : Makefile.am README
server : Makefile.am
server/asobj : Makefile.am
server/parser : Makefile.am
testsuite/actionscript.all: Makefile.am
win32/gnash : gnash.vcproj
win32/npgnash : npgnash.vcproj
Log message:
Removed references to SDL-mixer.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1215&r2=1.1216
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/config.mk.in?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_mp3.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/internals.xml?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/README?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/win32/gnash/gnash.vcproj?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/win32/npgnash/npgnash.vcproj?cvsroot=gnash&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1215
retrieving revision 1.1216
diff -u -b -r1.1215 -r1.1216
--- ChangeLog 15 Oct 2006 07:59:51 -0000 1.1215
+++ ChangeLog 15 Oct 2006 09:11:20 -0000 1.1216
@@ -1,6 +1,13 @@
2006-10-15 Markus Gothe <address@hidden>
- * doc/C/sources.xml: Removed references to SDL-mixer.
+ * doc/C/sources.xml, win32/npgnash/npgnash.vcproj, plugin/klash/README,
+ backend/sound_handler_mp3.cpp, backend/sound_handler_sdl.cpp,
+ win32/gnash/gnash.vcproj, backend/sound_handler_sdl.h,config.mk.in,
+ doc/C/internals.xml, gui/Makefile.am, libamf/Makefile.am, Makefile.am,
+ plugin/klash/Makefile.am, plugin/Makefile.am,server/asobj/Makefile.am,
+ server/Makefile.am, server/parser/Makefile.am,
+ testsuite/actionscript.all/Makefile.am:
+ Removed references to SDL-mixer.
2006-10-14 Sandro Santilli <address@hidden>
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- Makefile.am 11 Oct 2006 16:25:12 -0000 1.39
+++ Makefile.am 15 Oct 2006 09:11:20 -0000 1.40
@@ -32,6 +32,9 @@
# to release a modified version without this exception; this exception
# also makes it possible to release a modified version which carries
# forward this exception.
+#
+
+# $Id: Makefile.am,v 1.40 2006/10/15 09:11:20 nihilus Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -111,8 +114,6 @@
@echo "LIBXML_LIBS is $(LIBXML_LIBS)"
@echo "SDL_CFLAGS is $(SDL_CFLAGS)"
@echo "SDL_LIBS is $(SDL_LIBS)"
- @echo "SDL_MIXER_CFLAGS is $(SDL_MIXER_CFLAGS)"
- @echo "SDL_MIXER_LIBS is $(SDL_MIXER_LIBS)"
@echo "OPENGL_CFLAGS is $(OPENGL_CFLAGS)"
@echo "OPENGL_LIBS is $(OPENGL_LIBS)"
@echo "GLEXT_CFLAGS is $(GLEXT_CFLAGS)"
Index: config.mk.in
===================================================================
RCS file: /sources/gnash/gnash/config.mk.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- config.mk.in 19 Jan 2006 23:50:11 -0000 1.2
+++ config.mk.in 15 Oct 2006 09:11:20 -0000 1.3
@@ -1,4 +1,5 @@
# make configuration for the tu-testbed engine library
+# $Id: config.mk.in,v 1.3 2006/10/15 09:11:20 nihilus Exp $
CC = @CC@
CXX = @CXX@
@@ -14,9 +15,6 @@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_LIBS = @SDL_LIBS@
-SDL_MIXER_CFLAGS = @SDL_MIXER_CFLAGS@
-SDL_MIXER_LIBS = @SDL_MIXER_LIBS@
-
ZLIB_INCLUDE = @ZLIB_CFLAGS@
ZLIB = @ZLIB_LIBS@
@@ -56,8 +54,6 @@
AR = lib /nologo
SDL_INCLUDE := -I "$(SDL_DIR)/include"
SDL_LIBS := winmm.lib dxguid.lib kernel32.lib user32.lib gdi32.lib #
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib
-SDL_MIXER_INCLUDE := -I$(TOP)/../SDL_mixer-1.2.5/include
-SDL_MIXER_LIB := $(TOP)/../SDL_mixer-1.2.5/lib/SDL_mixer.lib
LIBS := opengl32.lib glu32.lib $(SDL_DIR)/lib/SDLmain.lib
$(SDL_DIR)/lib/SDL.lib gdi32.lib oldnames.lib $(SDL_LIBS)
CFLAGS := $(CFLAGS) /MD -GR -GX -DWIN32=1 -D_WIN32=1 $(USE_DL_MALLOC_FLAG) -W3
$(SDL_CFLAGS) $(GAMESWF_MP3_SUPPORT)
LDFLAGS := /link /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcd.lib
/INCREMENTAL:NO /subsystem:console
Index: backend/sound_handler_mp3.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_mp3.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- backend/sound_handler_mp3.cpp 20 Sep 2006 06:08:18 -0000 1.4
+++ backend/sound_handler_mp3.cpp 15 Oct 2006 09:11:20 -0000 1.5
@@ -5,12 +5,12 @@
* Do whatever you want with it.
*
* Some brain damaged helpers to decode mp3 streams for use in
- * a gnash::sound_handler that uses SDL_mixer for output.
+ * a gnash::sound_handler that uses SDL for output.
* (even comments are cut&paste compliant)
*
*/
-/* $Id: sound_handler_mp3.cpp,v 1.4 2006/09/20 06:08:18 nihilus Exp $ */
+/* $Id: sound_handler_mp3.cpp,v 1.5 2006/10/15 09:11:20 nihilus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -27,7 +27,6 @@
#include "log.h"
#include <cstdio>
-#include <SDL_mixer.h>
#include <mad.h>
#ifdef _MSC_VER
Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- backend/sound_handler_sdl.cpp 7 Oct 2006 16:13:52 -0000 1.22
+++ backend/sound_handler_sdl.cpp 15 Oct 2006 09:11:20 -0000 1.23
@@ -441,7 +441,7 @@
int sample_rate,
bool stereo)
// VERY crude sample-rate & sample-size conversion. Converts
-// input data to the SDL_mixer output format (SAMPLE_RATE,
+// input data to the SDL output format (SAMPLE_RATE,
// stereo, 16-bit native endianness)
{
// // xxxxx debug pass-thru
Index: backend/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- backend/sound_handler_sdl.h 9 Oct 2006 14:03:52 -0000 1.2
+++ backend/sound_handler_sdl.h 15 Oct 2006 09:11:20 -0000 1.3
@@ -148,7 +148,7 @@
virtual void get_info(int sound_handle, int* format, bool* stereo);
- // Converts input data to the SDL_mixer output format.
+ // Converts input data to the SDL output format.
virtual void convert_raw_data(int16_t** adjusted_data,
int* adjusted_size, void* data, int sample_count,
int sample_size, int sample_rate, bool stereo);
Index: doc/C/internals.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/internals.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- doc/C/internals.xml 10 Oct 2006 00:21:36 -0000 1.24
+++ doc/C/internals.xml 15 Oct 2006 09:11:20 -0000 1.25
@@ -51,7 +51,7 @@
<para>
Libgnashgui contains code for a portable GUI class that
- suppots using GTK2, a framnebuffer, SDL, or KDE.
+ suppots using GTK2, a framebuffer, SDL, or KDE.
</para>
</sect4>
@@ -1766,23 +1766,23 @@
<para>
When a sound is about to be played Gnash calls the sound handler, which
then starts to play the sound and return. All the playing is done by
- threads (in both SDL_mixer and Gstreamer), so once
+ threads (in both SDL and Gstreamer), so once
started the audio and graphics is not sync'ed with each other, which
means that we have to trust both the graphic backend and the audio
backend to play at correct speed.
</para>
</sect3>
- <sect3 id="sdl_mixer">
- <title>The SDL_mixer backend</title>
+ <sect3 id="sdl">
+ <title>The SDL backend</title>
<para>
- The SDL_mixer only support event-sounds, and it is not very likely that
+ The SDL only support event-sounds, and it is not very likely that
it will ever support soundstream. When receiving an event-sound it
decodes it at once, using either an internal ADPCM decoder, or the
madlib mp3-decoder, and then stores the audio-output in a raw format
- readable by SDL_mixer. When playing a sound all the raw data is
- transfered to SDL_mixer which plays it. The advantage with the
- SDL_mixer backend is that it gives instant playback when asked (no
+ readable by SDL. When playing a sound all the raw data is
+ transfered to SDL which plays it. The advantage with the
+ SDL backend is that it gives instant playback when asked (no
decoding delay, and very little setup delay). The drawbacks are that it
doesn't support soundstreams, and that it decodes everything when
parsing, which means that there can be a considerable pause when
@@ -1796,7 +1796,7 @@
The Gstreamer backend, though not complete, supports both soundstreams
and event-sounds. When receiving sounddata it stores it uncompressed,
unless if its ADPCM event-sounds, then it decodes in the same manner
- that the SDL_mixer backend does. When the playback starts, the backend
+ that the SDL backend does. When the playback starts, the backend
setup a
Gstreamer bin containing a decoder (and other things needed) and places
it in a Gstreamer pipeline, which plays the audio. All the sounddata is
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gui/Makefile.am 13 Oct 2006 16:46:23 -0000 1.33
+++ gui/Makefile.am 15 Oct 2006 09:11:20 -0000 1.34
@@ -34,7 +34,8 @@
# also makes it possible to release a modified version which carries
# forward this exception.
#
-#
+
+# $Id: Makefile.am,v 1.34 2006/10/15 09:11:20 nihilus Exp $
AUTOMAKE_OPTIONS =
@@ -47,7 +48,6 @@
-I$(top_srcdir)/libgeometry \
$(PTHREAD_CFLAGS) \
$(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
$(PANGO_CFLAGS) \
$(GLIB_CFLAGS) \
$(ATK_CFLAGS) \
Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libamf/Makefile.am 11 Oct 2006 15:45:17 -0000 1.15
+++ libamf/Makefile.am 15 Oct 2006 09:11:20 -0000 1.16
@@ -36,6 +36,8 @@
#
#
+# $Id: Makefile.am,v 1.16 2006/10/15 09:11:20 nihilus Exp $
+
AUTOMAKE_OPTIONS =
AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES)
@@ -44,7 +46,6 @@
$(top_builddir)/libbase/libgnashbase.la \
$(OPENGL_LIBS) \
$(SDL_LIBS) \
- $(SDL_MIXER_LIBS) \
$(X_LIBS) \
$(JPEG_LIBS) \
$(PNG_LIBS) \
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- plugin/Makefile.am 11 Oct 2006 15:57:43 -0000 1.48
+++ plugin/Makefile.am 15 Oct 2006 09:11:20 -0000 1.49
@@ -36,6 +36,8 @@
#
#
+# $Id: Makefile.am,v 1.49 2006/10/15 09:11:20 nihilus Exp $
+
AUTOMAKE_OPTIONS =
if KLASH
@@ -119,7 +121,6 @@
# $(GLIB_LIBS) \
# $(X_LIBS) \
# $(SDL_LIBS) \
-# $(SDL_MIXER_LIBS) \
# $(OPENGL_LIBS) \
# $(GLEXT_LIBS) \
# $(GTK2_LIBS) \
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- plugin/klash/Makefile.am 11 Oct 2006 15:57:43 -0000 1.15
+++ plugin/klash/Makefile.am 15 Oct 2006 09:11:20 -0000 1.16
@@ -34,7 +34,9 @@
# also makes it possible to release a modified version which carries
# forward this exception.
#
-#
+
+# $Id: Makefile.am,v 1.16 2006/10/15 09:11:20 nihilus Exp $
+
AUTOMAKE_OPTIONS =
AM_CPPFLAGS= -I$(kde_includes)/kio $(all_includes)
@@ -81,7 +83,6 @@
$(ZLIB_LIBS) \
$(LIBXML_LIBS) \
$(SDL_LIBS) \
- $(SDL_MIXER_LIBS) \
$(X_LIBS) \
$(MP3_LIBS) \
$(PTHREAD_LIBS) \
@@ -100,7 +101,6 @@
-I$(top_srcdir)/libgeometry \
$(PTHREAD_CFLAGS) \
$(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
$(LIBXML_CFLAGS) \
$(OPENGL_CFLAGS) \
$(PNG_CFLAGS) \
Index: plugin/klash/README
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- plugin/klash/README 4 Mar 2006 04:52:24 -0000 1.1
+++ plugin/klash/README 15 Oct 2006 09:11:20 -0000 1.2
@@ -2,4 +2,4 @@
project. As of this writing, you can only get it by checking it out their
CVS repository. It should be newer than 2006-02-23, because that version
has the -x option to embed in a window.
-You also need automake/autoconf and the SDL plus SDL+mixer development.
+You also need automake/autoconf and the SDL development.
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- server/Makefile.am 14 Oct 2006 11:24:19 -0000 1.73
+++ server/Makefile.am 15 Oct 2006 09:11:20 -0000 1.74
@@ -36,7 +36,7 @@
#
#
-# $Id: Makefile.am,v 1.73 2006/10/14 11:24:19 nihilus Exp $
+# $Id: Makefile.am,v 1.74 2006/10/15 09:11:20 nihilus Exp $
AUTOMAKE_OPTIONS =
@@ -61,7 +61,6 @@
$(OGG_CFLAGS) \
$(JPEG_CFLAGS) \
$(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
$(OPENGL_CFLAGS) \
$(GTK2_CFLAGS) \
$(PANGO_CFLAGS) \
Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/Makefile.am 14 Oct 2006 11:24:19 -0000 1.9
+++ server/asobj/Makefile.am 15 Oct 2006 09:11:20 -0000 1.10
@@ -36,7 +36,7 @@
#
#
-# $Id: Makefile.am,v 1.9 2006/10/14 11:24:19 nihilus Exp $
+# $Id: Makefile.am,v 1.10 2006/10/15 09:11:20 nihilus Exp $
AUTOMAKE_OPTIONS =
@@ -57,7 +57,6 @@
$(OGG_CFLAGS) \
$(JPEG_CFLAGS) \
$(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
$(OPENGL_CFLAGS) \
$(GTK2_CFLAGS) \
$(PANGO_CFLAGS) \
Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/parser/Makefile.am 14 Oct 2006 11:24:19 -0000 1.9
+++ server/parser/Makefile.am 15 Oct 2006 09:11:20 -0000 1.10
@@ -36,7 +36,7 @@
#
#
-# $Id: Makefile.am,v 1.9 2006/10/14 11:24:19 nihilus Exp $
+# $Id: Makefile.am,v 1.10 2006/10/15 09:11:20 nihilus Exp $
AUTOMAKE_OPTIONS =
@@ -62,7 +62,6 @@
$(OGG_CFLAGS) \
$(JPEG_CFLAGS) \
$(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
$(OPENGL_CFLAGS) \
$(GTK2_CFLAGS) \
$(PANGO_CFLAGS) \
Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- testsuite/actionscript.all/Makefile.am 15 Oct 2006 02:30:55 -0000
1.35
+++ testsuite/actionscript.all/Makefile.am 15 Oct 2006 09:11:21 -0000
1.36
@@ -35,7 +35,7 @@
# also makes it possible to release a modified version which carries
# forward this exception.
-#
+# $Id: Makefile.am,v 1.36 2006/10/15 09:11:21 nihilus Exp $
AUTOMAKE_OPTIONS = dejagnu
@@ -55,7 +55,7 @@
$(OGG_CFLAGS) \
$(MING_CFLAGS) \
$(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS)
+ $(NULL)
# @@ Is this still needed ?
# @@ Should we add all generated files ?
Index: win32/gnash/gnash.vcproj
===================================================================
RCS file: /sources/gnash/gnash/win32/gnash/gnash.vcproj,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- win32/gnash/gnash.vcproj 27 Sep 2006 08:51:39 -0000 1.16
+++ win32/gnash/gnash.vcproj 15 Oct 2006 09:11:21 -0000 1.17
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="sdl.lib zlib.lib
sdl_mixer.lib jpeg.lib sdlmain.lib opengl32.lib ws2_32.lib libcurl.lib
WinMM.lib libmysql.lib"
+ AdditionalDependencies="sdl.lib zlib.lib
jpeg.lib sdlmain.lib opengl32.lib ws2_32.lib libcurl.lib WinMM.lib libmysql.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="LIBCMT.lib"
GenerateDebugInformation="true"
@@ -139,7 +139,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="sdl.lib zlib.lib
sdl_mixer.lib jpeg.lib sdlmain.lib opengl32.lib ws2_32.lib libcurl.lib
WinMM.lib libmysql.lib pthreadVC.lib"
+ AdditionalDependencies="sdl.lib zlib.lib
jpeg.lib sdlmain.lib opengl32.lib ws2_32.lib libcurl.lib WinMM.lib libmysql.lib
pthreadVC.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="LIBCMT.lib"
GenerateDebugInformation="true"
Index: win32/npgnash/npgnash.vcproj
===================================================================
RCS file: /sources/gnash/gnash/win32/npgnash/npgnash.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- win32/npgnash/npgnash.vcproj 15 Sep 2006 11:01:40 -0000 1.5
+++ win32/npgnash/npgnash.vcproj 15 Oct 2006 09:11:21 -0000 1.6
@@ -63,7 +63,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="sdl.lib zlib.lib
sdl_mixer.lib jpeg.lib sdlmain.lib opengl32.lib ws2_32.lib libcurl.lib
WinMM.lib libmysql.lib nspr4.lib plds4.lib plc4.lib"
+ AdditionalDependencies="sdl.lib zlib.lib
jpeg.lib sdlmain.lib opengl32.lib ws2_32.lib libcurl.lib WinMM.lib libmysql.lib
nspr4.lib plds4.lib plc4.lib"
OutputFile="C:\Program Files\Mozilla
Firefox\plugins\$(ProjectName).dll"
LinkIncremental="2"
IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -143,7 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="sdl.lib zlib.lib
sdl_mixer.lib jpeg.lib sdlmain.lib opengl32.lib ws2_32.lib libcurl.lib
WinMM.lib libmysql.lib nspr4.lib plds4.lib plc4.lib"
+ AdditionalDependencies="sdl.lib zlib.lib
jpeg.lib sdlmain.lib opengl32.lib ws2_32.lib libcurl.lib WinMM.lib libmysql.lib
nspr4.lib plds4.lib plc4.lib"
OutputFile="C:\Program Files\Mozilla
Firefox\plugins\$(ProjectName).dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="LIBCMT.lib"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am config.mk.in backen...,
Markus Gothe <=