[Gnash-commit] gnash ChangeLog config.mk.in compatibility_incl...

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/01/30 23:05:42

Modified files:
        .              : ChangeLog config.mk.in compatibility_include.h 

Log message:
        Remove unused GAMESWF defines

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2199&r2=1.2200
http://cvs.savannah.gnu.org/viewcvs/gnash/config.mk.in?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/compatibility_include.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2199
retrieving revision 1.2200
diff -u -b -r1.2199 -r1.2200
--- ChangeLog   30 Jan 2007 18:29:40 -0000      1.2199
+++ ChangeLog   30 Jan 2007 23:05:42 -0000      1.2200
@@ -1,3 +1,7 @@
+2007-01-30 Martin Guy <address@hidden>
+
+       * config.mk.in, compatibility_include.h: Remove unused GAMESWF defines
+
 2007-01-30 Sandro Santilli <address@hidden>
 
        * server/: character.{h,cpp}, sprite_instance.cpp:
@@ -6,7 +10,12 @@
          instances and whichever other ActionScript class
          associated with a character (_x,_y,_width...).
 
-2007-01-30 Martin Guy <address@hidden>
+2007-01-25 Martin Guy <address@hidden>
+
+       * configure.ac: Make libjpeg presence mandatory and fail otherwise;
+         otherwise compilation fails.
+
+2007-01-25 Martin Guy <address@hidden>
 
        * configure.ac: Fix message about Debian packages required for boost
 

Index: config.mk.in
===================================================================
RCS file: /sources/gnash/gnash/config.mk.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- config.mk.in        15 Oct 2006 09:11:20 -0000      1.3
+++ config.mk.in        30 Jan 2007 23:05:42 -0000      1.4
@@ -1,5 +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 $
+# $Id: config.mk.in,v 1.4 2007/01/30 23:05:42 martinwguy Exp $
 
 CC = @CC@
 CXX = @CXX@
@@ -31,18 +31,8 @@
 LIBXML_CFLAGS = @LIBXML_CFLAGS@
 LIBXML_LIBS = @LIBXML_LIBS@
 
-# If you have libmad installed
-# (http://www.underbit.com/products/mad/), and you want to compile
-# gameswf with mp3 support, uncomment below.  Note that libmad is
-# GPL'd, so if you want to distribute binaries based on this, you must
-# distribute the associated source under GPL as well.
-#GAMESWF_MP3_SUPPORT=-DGAMESWF_MP3_SUPPORT=1
-##LIBMAD_LIB=-lmad
-#LIBMAD_LIB=../../libmad-0.15.1b/msvc++/Release/libmad.lib
-#LIBMAD_INCLUDE=-I../../libmad-0.15.1b
-
 DEFS = @DEFS@
-CFLAGS := $(DEFS) $(CFLAGS) $(SDL_CFLAGS) -fPIC -Wall $(GAMESWF_MP3_SUPPORT)
+CFLAGS := $(DEFS) $(CFLAGS) $(SDL_CFLAGS) -fPIC -Wall
 MAKE_DLL := $(CC) -shared
 
 #include $(top_srcdir)/config
@@ -55,7 +45,7 @@
 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
 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)
+CFLAGS := $(CFLAGS) /MD -GR -GX -DWIN32=1 -D_WIN32=1 $(USE_DL_MALLOC_FLAG) -W3 
$(SDL_CFLAGS)
 LDFLAGS := /link /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcd.lib 
/INCREMENTAL:NO /subsystem:console
 endif
 ifeq ($(DEBUG),1)

Index: compatibility_include.h
===================================================================
RCS file: /sources/gnash/gnash/compatibility_include.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- compatibility_include.h     20 Dec 2005 21:12:01 -0000      1.1
+++ compatibility_include.h     30 Jan 2007 23:05:42 -0000      1.2
@@ -27,11 +27,6 @@
 // Some optional gameswf configuration.
 //
 
-// #define GAMESWF_FONT_NOMINAL_GLYPH_SIZE_DEFAULT 32
-
-// Define this to avoid using mesh shapes to render large text
-// #define GAMESWF_ALWAYS_USE_TEXTURES_FOR_TEXT_WHEN_POSSIBLE 1
-
 // For disabling zlib and jpeg functionality; you may be able to use
 // this in final builds of gameswf, if you preprocess all your SWF
 // content to make unpacked formats.