Mercurial > hg > forks > 3x666-SDL

changeset 38:efb2709f3b00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated recording patch.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 19 Mar 2013 03:00:51 +0200
parents 38b7583302c3
children da3a7c376a84
files recording.patch
diffstat 1 files changed, 22 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/recording.patch	Tue Mar 19 02:55:25 2013 +0200
+++ b/recording.patch	Tue Mar 19 03:00:51 2013 +0200
@@ -1,11 +1,11 @@
-diff -r 62b5f87ebb2a 3x666.c
---- a/3x666.c	Tue Mar 19 02:46:34 2013 +0200
-+++ b/3x666.c	Tue Mar 19 02:46:50 2013 +0200
+diff -r 38b7583302c3 3x666.c
+--- a/3x666.c	Tue Mar 19 02:55:25 2013 +0200
++++ b/3x666.c	Tue Mar 19 03:00:45 2013 +0200
 @@ -7,6 +7,19 @@
  #include "config.h"
  #include "3xfont.h"
  
-+//#define RECORD 1
++#define RECORD 1
 +#define RECORD_FPS 50
 +#define RECORD_AUDIO_FILE "audio.wav"
 +#define RECORD_VIDEO_FILE "%05d.png"
@@ -38,7 +38,7 @@
  
  static void dmPrintVA(int level, const char *fmt, va_list ap)
  {
-@@ -98,6 +114,7 @@
+@@ -99,6 +115,7 @@
      dmErrorVA(fmt, ap);
      va_end(ap);
  }
@@ -46,7 +46,7 @@
  
      
  static int engineGetTick()
-@@ -964,10 +981,12 @@
+@@ -994,10 +1011,12 @@
      engine.optAfmt.callback = engineAudioCallback;
      
      // Initialize SDL audio
@@ -59,7 +59,7 @@
  
      // Initialize SDL video
      if (!engineInitializeVideo())
-@@ -989,13 +1008,53 @@
+@@ -1019,13 +1038,53 @@
  
      // Start audio, enter main loop
      dmPrint(0, "We are go.\n");
@@ -113,7 +113,7 @@
          // Handle SDL events
          while (SDL_PollEvent(&engine.event))
          switch (engine.event.type)
-@@ -1036,8 +1095,9 @@
+@@ -1066,8 +1125,9 @@
                  break;
          }
  
@@ -124,7 +124,7 @@
          int qt = engineGetTick(&engine);
  
          if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0)
-@@ -1154,13 +1214,25 @@
+@@ -1184,13 +1244,25 @@
              n /= 10;
          }
  
@@ -151,7 +151,7 @@
      }
  
  error_exit:
-@@ -1176,9 +1248,26 @@
+@@ -1206,9 +1278,26 @@
      if (engine.screen)
          SDL_FreeSurface(engine.screen);
  
@@ -178,15 +178,21 @@
  
      audio_close();
  
-diff -r 62b5f87ebb2a Makefile.gen
---- a/Makefile.gen	Tue Mar 19 02:46:34 2013 +0200
-+++ b/Makefile.gen	Tue Mar 19 02:46:50 2013 +0200
-@@ -26,6 +26,8 @@
+diff -r 38b7583302c3 Makefile.gen
+--- a/Makefile.gen	Tue Mar 19 02:55:25 2013 +0200
++++ b/Makefile.gen	Tue Mar 19 03:00:45 2013 +0200
+@@ -24,11 +24,10 @@
+ ### Main demo
+ ###
  $(OBJPATH)3x666.o: 3x666.c config.h 3xfont.h
- 	$(CC) $(CFLAGS) -c -o $@ $< $(SDL_CFLAGS) -Idmlib/
+-	$(CC) $(CFLAGS) -c -o $@ $< $(SDL_CFLAGS) -Idmlib/
++	$(CC) $(CFLAGS) -c -o $@ $< $(SDL_CFLAGS) -Idmlib/ -DDM_USE_LIBPNG
  
+-$(BINPATH)3x666$(EXEEXT): $(OBJPATH)3x666.o
+-	$(CC) -o $@ $+ $(LDFLAGS) $(SDL_LDFLAGS)
+-
 +$(BINPATH)3x666$(EXEEXT): $(OBJPATH)3x666.o dmlib/unix/dmwav.o dmlib/unix/dmfile.o dmlib/unix/dmlib.o dmlib/unix/libgfx.o dmlib/unix/dmbstr.o
 +	$(CC) -o $@ $+ $(LDFLAGS) $(SDL_LDFLAGS) -lpng
  
- 
  ###
+ ### Special targets