r14979 - in packages/trunk/desmume/debian: . patches

Evgeni Golov evgeni at moszumanska.debian.org
Sun Mar 23 10:51:22 UTC 2014 

Author: evgeni
Date: 2014-03-23 10:51:22 +0000 (Sun, 23 Mar 2014)
New Revision: 14979

Modified:
   packages/trunk/desmume/debian/
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch
Log:
import 0.9.10, refresh patches



Property changes on: packages/trunk/desmume/debian
___________________________________________________________________
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.9.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.10.orig.tar.gz

Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2014-03-22 13:54:44 UTC (rev 14978)
+++ packages/trunk/desmume/debian/changelog	2014-03-23 10:51:22 UTC (rev 14979)
@@ -1,8 +1,10 @@
-desmume (0.9.9-2) UNRELEASED; urgency=low
+desmume (0.9.10-1) UNRELEASED; urgency=low
 
+  * New upstream reease.
+  * Refresh 01_use_system_tinyxml.patch against 0.9.10.
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:21:17 +0200
+ -- Evgeni Golov <evgeni at debian.org>  Sun, 23 Mar 2014 11:40:59 +0100
 
 desmume (0.9.9-1) unstable; urgency=low
 

Modified: packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch	2014-03-22 13:54:44 UTC (rev 14978)
+++ packages/trunk/desmume/debian/patches/01_use_system_tinyxml.patch	2014-03-23 10:51:22 UTC (rev 14979)
@@ -1,12 +1,12 @@
 From: Evgeni Golov <evgeni at debian.org>
 Subject: use the system tinyxml instead of the embedded copy
-Last-Update: 2013-05-05
+Last-Update: 2014-03-23
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index b8bb18e..b027330 100644
+index 13d7957..0284eed 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -79,12 +79,6 @@ libdesmume_a_SOURCES = \
+@@ -82,12 +82,6 @@ libdesmume_a_SOURCES = \
  	utils/libfat/mem_allocate.h \
  	utils/libfat/partition.cpp \
  	utils/libfat/partition.h \
@@ -16,39 +16,40 @@
 -	utils/tinyxml/tinyxml.h \
 -	utils/tinyxml/tinyxmlerror.cpp \
 -	utils/tinyxml/tinyxmlparser.cpp \
- 	addons.cpp addons.h \
- 	addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/slot2_gbagame.cpp addons/slot2_none.cpp addons/slot2_rumblepak.cpp addons/slot2_guitarGrip.cpp addons/slot2_expMemory.cpp addons/slot2_piano.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail.cpp addons/slot1_retail_nand.cpp \
+ 	addons/slot2_auto.cpp addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/slot2_gbagame.cpp addons/slot2_none.cpp addons/slot2_rumblepak.cpp addons/slot2_guitarGrip.cpp addons/slot2_expMemory.cpp addons/slot2_piano.cpp addons/slot2_passme.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail_nand.cpp addons/slot1_retail_auto.cpp addons/slot1_retail_mcrom.cpp addons/slot1_retail_mcrom_debug.cpp addons/slot1comp_mc.cpp addons/slot1comp_mc.h addons/slot1comp_rom.h addons/slot1comp_rom.cpp addons/slot1comp_protocol.h addons/slot1comp_protocol.cpp \
  	cheatSystem.cpp cheatSystem.h \
-@@ -201,3 +195,4 @@ if HAVE_GDB_STUB
+ 	texcache.cpp texcache.h rasterize.cpp rasterize.h \
+@@ -203,3 +197,4 @@ if HAVE_GDB_STUB
  libdesmume_a_SOURCES += gdbstub.h
  endif
  libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
 +LIBS += -ltinyxml
 diff --git a/src/Makefile.in b/src/Makefile.in
-index b862802..dcebe7d 100644
+index 27747fe..5e207f5 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -183,9 +183,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \
+@@ -215,9 +215,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \
  	utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \
  	utils/libfat/lock.h utils/libfat/mem_allocate.h \
  	utils/libfat/partition.cpp utils/libfat/partition.h \
 -	utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \
 -	utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \
 -	utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \
- 	addons.cpp addons.h addons/slot2_mpcf.cpp \
+ 	addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
  	addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
  	addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
-@@ -295,8 +292,7 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \
- 	fatfile.$(OBJEXT) filetime.$(OBJEXT) \
- 	file_allocation_table.$(OBJEXT) libfat.$(OBJEXT) \
- 	libfat_public_api.$(OBJEXT) lock.$(OBJEXT) partition.$(OBJEXT) \
--	tinystr.$(OBJEXT) tinyxml.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
--	tinyxmlparser.$(OBJEXT) addons.$(OBJEXT) slot2_mpcf.$(OBJEXT) \
-+	addons.$(OBJEXT) slot2_mpcf.$(OBJEXT) \
- 	slot2_paddle.$(OBJEXT) slot2_gbagame.$(OBJEXT) \
- 	slot2_none.$(OBJEXT) slot2_rumblepak.$(OBJEXT) \
- 	slot2_guitarGrip.$(OBJEXT) slot2_expMemory.$(OBJEXT) \
-@@ -434,7 +430,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@
+@@ -354,10 +351,6 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \
+ 	utils/libfat/libfat.$(OBJEXT) \
+ 	utils/libfat/libfat_public_api.$(OBJEXT) \
+ 	utils/libfat/lock.$(OBJEXT) utils/libfat/partition.$(OBJEXT) \
+-	utils/tinyxml/tinystr.$(OBJEXT) \
+-	utils/tinyxml/tinyxml.$(OBJEXT) \
+-	utils/tinyxml/tinyxmlerror.$(OBJEXT) \
+-	utils/tinyxml/tinyxmlparser.$(OBJEXT) \
+ 	addons/slot2_auto.$(OBJEXT) addons/slot2_mpcf.$(OBJEXT) \
+ 	addons/slot2_paddle.$(OBJEXT) addons/slot2_gbagame.$(OBJEXT) \
+ 	addons/slot2_none.$(OBJEXT) addons/slot2_rumblepak.$(OBJEXT) \
+@@ -554,7 +547,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@
  LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
  LIBGLADE_LIBS = @LIBGLADE_LIBS@
  LIBOBJS = @LIBOBJS@
@@ -57,90 +58,83 @@
  LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@
  LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -592,9 +588,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \
+@@ -704,9 +697,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \
  	utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \
  	utils/libfat/lock.h utils/libfat/mem_allocate.h \
  	utils/libfat/partition.cpp utils/libfat/partition.h \
 -	utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \
 -	utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \
 -	utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \
- 	addons.cpp addons.h addons/slot2_mpcf.cpp \
+ 	addons/slot2_auto.cpp addons/slot2_mpcf.cpp \
  	addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \
  	addons/slot2_none.cpp addons/slot2_rumblepak.cpp \
-@@ -764,10 +757,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/task.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/texcache.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/thumb_instructions.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tinystr.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tinyxml.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tinyxmlerror.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tinyxmlparser.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vfat.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/videofilter.Po at am__quote@
-@@ -1136,62 +1125,6 @@ partition.obj: utils/libfat/partition.cpp
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o partition.obj `if test -f 'utils/libfat/partition.cpp'; then $(CYGPATH_W) 'utils/libfat/partition.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/libfat/partition.cpp'; fi`
+@@ -839,20 +829,6 @@ utils/libfat/lock.$(OBJEXT): utils/libfat/$(am__dirstamp) \
+ 	utils/libfat/$(DEPDIR)/$(am__dirstamp)
+ utils/libfat/partition.$(OBJEXT): utils/libfat/$(am__dirstamp) \
+ 	utils/libfat/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/$(am__dirstamp):
+-	@$(MKDIR_P) utils/tinyxml
+-	@: > utils/tinyxml/$(am__dirstamp)
+-utils/tinyxml/$(DEPDIR)/$(am__dirstamp):
+-	@$(MKDIR_P) utils/tinyxml/$(DEPDIR)
+-	@: > utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/tinystr.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
+-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/tinyxml.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
+-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/tinyxmlerror.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
+-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-utils/tinyxml/tinyxmlparser.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \
+-	utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+ addons/$(am__dirstamp):
+ 	@$(MKDIR_P) addons
+ 	@: > addons/$(am__dirstamp)
+@@ -1038,7 +1014,6 @@ mostlyclean-compile:
+ 	-rm -f utils/AsmJit/x86/*.$(OBJEXT)
+ 	-rm -f utils/decrypt/*.$(OBJEXT)
+ 	-rm -f utils/libfat/*.$(OBJEXT)
+-	-rm -f utils/tinyxml/*.$(OBJEXT)
  
--tinystr.o: utils/tinyxml/tinystr.cpp
-- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.o -MD -MP -MF $(DEPDIR)/tinystr.Tpo -c -o tinystr.o `test -f 'utils/tinyxml/tinystr.cpp' || echo '$(srcdir)/'`utils/tinyxml/tinystr.cpp
-- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tinystr.Tpo $(DEPDIR)/tinystr.Po
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utils/tinyxml/tinystr.cpp' object='tinystr.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f 'utils/tinyxml/tinystr.cpp' || echo '$(srcdir)/'`utils/tinyxml/tinystr.cpp
--
--tinystr.obj: utils/tinyxml/tinystr.cpp
-- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.obj -MD -MP -MF $(DEPDIR)/tinystr.Tpo -c -o tinystr.obj `if test -f 'utils/tinyxml/tinystr.cpp'; then $(CYGPATH_W) 'utils/tinyxml/tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/tinyxml/tinystr.cpp'; fi`
-- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tinystr.Tpo $(DEPDIR)/tinystr.Po
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utils/tinyxml/tinystr.cpp' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f 'utils/tinyxml/tinystr.cpp'; then $(CYGPATH_W) 'utils/tinyxml/tinystr.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/tinyxml/tinystr.cpp'; fi`
--
--tinyxml.o: utils/tinyxml/tinyxml.cpp
-- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.o -MD -MP -MF $(DEPDIR)/tinyxml.Tpo -c -o tinyxml.o `test -f 'utils/tinyxml/tinyxml.cpp' || echo '$(srcdir)/'`utils/tinyxml/tinyxml.cpp
-- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tinyxml.Tpo $(DEPDIR)/tinyxml.Po
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utils/tinyxml/tinyxml.cpp' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f 'utils/tinyxml/tinyxml.cpp' || echo '$(srcdir)/'`utils/tinyxml/tinyxml.cpp
--
--tinyxml.obj: utils/tinyxml/tinyxml.cpp
-- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.obj -MD -MP -MF $(DEPDIR)/tinyxml.Tpo -c -o tinyxml.obj `if test -f 'utils/tinyxml/tinyxml.cpp'; then $(CYGPATH_W) 'utils/tinyxml/tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/tinyxml/tinyxml.cpp'; fi`
-- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tinyxml.Tpo $(DEPDIR)/tinyxml.Po
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utils/tinyxml/tinyxml.cpp' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f 'utils/tinyxml/tinyxml.cpp'; then $(CYGPATH_W) 'utils/tinyxml/tinyxml.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/tinyxml/tinyxml.cpp'; fi`
--
--tinyxmlerror.o: utils/tinyxml/tinyxmlerror.cpp
-- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.o -MD -MP -MF $(DEPDIR)/tinyxmlerror.Tpo -c -o tinyxmlerror.o `test -f 'utils/tinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`utils/tinyxml/tinyxmlerror.cpp
-- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tinyxmlerror.Tpo $(DEPDIR)/tinyxmlerror.Po
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utils/tinyxml/tinyxmlerror.cpp' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f 'utils/tinyxml/tinyxmlerror.cpp' || echo '$(srcdir)/'`utils/tinyxml/tinyxmlerror.cpp
--
--tinyxmlerror.obj: utils/tinyxml/tinyxmlerror.cpp
-- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.obj -MD -MP -MF $(DEPDIR)/tinyxmlerror.Tpo -c -o tinyxmlerror.obj `if test -f 'utils/tinyxml/tinyxmlerror.cpp'; then $(CYGPATH_W) 'utils/tinyxml/tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/tinyxml/tinyxmlerror.cpp'; fi`
-- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tinyxmlerror.Tpo $(DEPDIR)/tinyxmlerror.Po
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utils/tinyxml/tinyxmlerror.cpp' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f 'utils/tinyxml/tinyxmlerror.cpp'; then $(CYGPATH_W) 'utils/tinyxml/tinyxmlerror.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/tinyxml/tinyxmlerror.cpp'; fi`
--
--tinyxmlparser.o: utils/tinyxml/tinyxmlparser.cpp
-- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.o -MD -MP -MF $(DEPDIR)/tinyxmlparser.Tpo -c -o tinyxmlparser.o `test -f 'utils/tinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`utils/tinyxml/tinyxmlparser.cpp
-- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tinyxmlparser.Tpo $(DEPDIR)/tinyxmlparser.Po
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utils/tinyxml/tinyxmlparser.cpp' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f 'utils/tinyxml/tinyxmlparser.cpp' || echo '$(srcdir)/'`utils/tinyxml/tinyxmlparser.cpp
--
--tinyxmlparser.obj: utils/tinyxml/tinyxmlparser.cpp
-- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.obj -MD -MP -MF $(DEPDIR)/tinyxmlparser.Tpo -c -o tinyxmlparser.obj `if test -f 'utils/tinyxml/tinyxmlparser.cpp'; then $(CYGPATH_W) 'utils/tinyxml/tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/tinyxml/tinyxmlparser.cpp'; fi`
-- at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tinyxmlparser.Tpo $(DEPDIR)/tinyxmlparser.Po
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utils/tinyxml/tinyxmlparser.cpp' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'utils/tinyxml/tinyxmlparser.cpp'; then $(CYGPATH_W) 'utils/tinyxml/tinyxmlparser.cpp'; else $(CYGPATH_W) '$(srcdir)/utils/tinyxml/tinyxmlparser.cpp'; fi`
--
- slot2_mpcf.o: addons/slot2_mpcf.cpp
- @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT slot2_mpcf.o -MD -MP -MF $(DEPDIR)/slot2_mpcf.Tpo -c -o slot2_mpcf.o `test -f 'addons/slot2_mpcf.cpp' || echo '$(srcdir)/'`addons/slot2_mpcf.cpp
- @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/slot2_mpcf.Tpo $(DEPDIR)/slot2_mpcf.Po
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -1171,10 +1146,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/libfat_public_api.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/lock.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at utils/libfat/$(DEPDIR)/partition.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinystr.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxml.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po at am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@@ -1409,8 +1380,6 @@ distclean-generic:
+ 	-rm -f utils/decrypt/$(am__dirstamp)
+ 	-rm -f utils/libfat/$(DEPDIR)/$(am__dirstamp)
+ 	-rm -f utils/libfat/$(am__dirstamp)
+-	-rm -f utils/tinyxml/$(DEPDIR)/$(am__dirstamp)
+-	-rm -f utils/tinyxml/$(am__dirstamp)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -1420,7 +1389,7 @@ clean: clean-recursive
+ clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+ 
+ distclean: distclean-recursive
+-	-rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR)
++	-rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-tags
+@@ -1466,7 +1435,7 @@ install-ps-am:
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+-	-rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR)
++	-rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
 diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
 index 1985209..d958323 100644
 --- a/src/cli/Makefile.am
@@ -155,10 +149,10 @@
  desmume_cli_LDADD += ../gdbstub/libgdbstub.a
  endif
 diff --git a/src/cli/Makefile.in b/src/cli/Makefile.in
-index 6d4d37d..722099f 100644
+index 7e9afc3..f568745 100644
 --- a/src/cli/Makefile.in
 +++ b/src/cli/Makefile.in
-@@ -320,7 +320,7 @@ AM_LDFLAGS =
+@@ -387,7 +387,7 @@ AM_LDFLAGS =
  desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp
  desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) \
  	$(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) \
@@ -181,10 +175,10 @@
  desmume_glade_LDADD += ../gdbstub/libgdbstub.a
  endif
 diff --git a/src/gtk-glade/Makefile.in b/src/gtk-glade/Makefile.in
-index 103dc8b..930ddac 100644
+index b633083..e7dd238 100644
 --- a/src/gtk-glade/Makefile.in
 +++ b/src/gtk-glade/Makefile.in
-@@ -375,7 +375,7 @@ desmume_glade_SOURCES = \
+@@ -443,7 +443,7 @@ desmume_glade_SOURCES = \
  
  desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \
  	$(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
@@ -194,10 +188,10 @@
  
  .SUFFIXES:
 diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
-index 4cdf643..88ca09a 100644
+index 4bfda77..29bacc3 100644
 --- a/src/gtk/Makefile.am
 +++ b/src/gtk/Makefile.am
-@@ -26,7 +26,7 @@ desmume_SOURCES = \
+@@ -27,7 +27,7 @@ desmume_SOURCES = \
  	../filter/videofilter.cpp ../filter/videofilter.h \
  	main.cpp main.h
  desmume_LDADD = ../libdesmume.a \
@@ -207,34 +201,20 @@
  desmume_LDADD += ../gdbstub/libgdbstub.a
  endif
 diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in
-index 120353f..cb5e5f1 100644
+index 3718566..a653c99 100644
 --- a/src/gtk/Makefile.in
 +++ b/src/gtk/Makefile.in
-@@ -377,7 +377,8 @@ desmume_SOURCES = \
+@@ -452,7 +452,7 @@ desmume_SOURCES = \
  
  desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \
  	$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
--	$(LIBSOUNDTOUCH_LIBS) $(am__append_1) $(am__append_2)
-+	$(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) \
-+	$(am__append_2)
+-	$(LIBSOUNDTOUCH_LIBS) $(am__append_1) $(am__append_2) \
++	$(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) $(am__append_2) \
+ 	$(am__append_3)
  UPDATE_DESKTOP = \
    appsdir=$(DESTDIR)$(datadir)/applications ; \
-   if [ -f $$appsdir/mimeinfo.cache ] ; then \
-diff --git a/src/mc.cpp b/src/mc.cpp
-index eedf0d3..0a3fde9 100644
---- a/src/mc.cpp
-+++ b/src/mc.cpp
-@@ -26,7 +26,7 @@
- #include "readwrite.h"
- #include "NDSSystem.h"
- #define TIXML_USE_STL
--#include "utils/tinyxml/tinyxml.h"
-+#include <tinyxml.h>
- 
- //temporary hack until we have better error reporting facilities
- #ifdef _WINDOWS
 diff --git a/src/mc.h b/src/mc.h
-index 7afcd60..2848b01 100644
+index 2495d7b..1c44753 100644
 --- a/src/mc.h
 +++ b/src/mc.h
 @@ -26,7 +26,7 @@
@@ -246,3 +226,16 @@
  
  #define MAX_SAVE_TYPES 13
  #define MC_TYPE_AUTODETECT      0x0
+diff --git a/src/utils/advanscene.cpp b/src/utils/advanscene.cpp
+index af22335..ca3dd33 100644
+--- a/src/utils/advanscene.cpp
++++ b/src/utils/advanscene.cpp
+@@ -19,7 +19,7 @@
+ #include <time.h>
+ 
+ #define TIXML_USE_STL
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include "advanscene.h"
+ #include "mc.h"

More information about the Pkg-games-commits mailing list