Menu
▾
▴
vba-commit
|
From: S?bastien G. <kx...@us...> - 2004-04-02 01:34:23
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26860/src/gtk Modified Files: Makefile.am Makefile.in filters.h main.cpp screenarea.cpp screenarea.h vba.glade window.cpp window.h Added Files: configfile.cpp configfile.h filters.cpp Log Message: The GTK+ frontend is growing.. the binary is now called gvba. Index: filters.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/filters.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** filters.h 29 Mar 2004 22:08:40 -0000 1.1 --- filters.h 2 Apr 2004 01:22:17 -0000 1.2 *************** *** 57,63 **** --- 57,102 ---- void MotionBlurIB32(u8 *, u32, int, int); + namespace VBA + { + typedef void (*Filter2x)(u8 *, u32, u8 *, u8 *, u32, int, int); typedef void (*FilterIB)(u8 *, u32, int, int); + enum EFilter2x + { + FilterNone, + Filter2xSaI, + FilterSuper2xSaI, + FilterSuperEagle, + FilterPixelate, + FilterMotionBlur, + FilterAdMame2x, + FilterSimple2x, + FilterBilinear, + FilterBilinearPlus, + FilterScanlines, + FilterScanlinesTV, + FilterHq2x, + FilterLq2x + }; + + enum EFilterIB + { + FilterIBNone, + FilterIBSmart, + FilterIBMotionBlur + }; + + enum EFilterDepth + { + FilterDepth16, + FilterDepth32 + }; + + Filter2x pvGetFilter2x(EFilter2x _eFilter2x, EFilterDepth _eDepth); + FilterIB pvGetFilterIB(EFilterIB _eFilterIB, EFilterDepth _eDepth); + + } // namespace VBA + #endif // __VBA_FILTERS_H__ Index: main.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main.cpp 29 Mar 2004 22:08:40 -0000 1.1 --- main.cpp 2 Apr 2004 01:22:17 -0000 1.2 *************** *** 55,58 **** --- 55,59 ---- Gtk::Main::run(*poWindow); + delete poWindow; return 0; Index: screenarea.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/screenarea.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** screenarea.h 29 Mar 2004 22:10:15 -0000 1.1 --- screenarea.h 2 Apr 2004 01:22:17 -0000 1.2 *************** *** 36,41 **** void vSetSize(int _iWidth, int _iHeight); void vSetScale(int _iScale); ! void vSetFilter2x(Filter2x _vFilter); ! void vDrawPixels(const u8 * _puiData); void vDrawColor(u32 _uiColor); // 0xRRGGBB --- 36,42 ---- void vSetSize(int _iWidth, int _iHeight); void vSetScale(int _iScale); ! void vSetFilter2x(EFilter2x _eFilter2x); ! void vSetFilterIB(EFilterIB _eFilterIB); ! void vDrawPixels(u8 * _puiData); void vDrawColor(u32 _uiColor); // 0xRRGGBB *************** *** 53,56 **** --- 54,58 ---- u8 * m_puiDelta; Filter2x m_vFilter2x; + FilterIB m_vFilterIB; void vUpdateSize(); Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 29 Mar 2004 22:08:40 -0000 1.1 --- Makefile.in 2 Apr 2004 01:22:17 -0000 1.2 *************** *** 151,159 **** target_os = @target_os@ target_vendor = @target_vendor@ ! bin_PROGRAMS = gVisualBoyAdvance noinst_LIBRARIES = libgba.a ! gVisualBoyAdvance_SOURCES = \ filters.h \ input.cpp \ --- 151,162 ---- target_os = @target_os@ target_vendor = @target_vendor@ ! bin_PROGRAMS = gvba noinst_LIBRARIES = libgba.a ! gvba_SOURCES = \ ! configfile.cpp \ ! configfile.h \ ! filters.cpp \ filters.h \ input.cpp \ *************** *** 170,176 **** ! gVisualBoyAdvance_LDADD = libgba.a @VBA_LIBS@ @GTKMM_LIBS@ @LIBINTL@ @SDL_LIBS@ ! gVisualBoyAdvance_CPPFLAGS = \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ --- 173,179 ---- ! gvba_LDADD = libgba.a @VBA_LIBS@ @GTKMM_LIBS@ @LIBINTL@ @SDL_LIBS@ ! gvba_CPPFLAGS = \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ *************** *** 178,182 **** ! gVisualBoyAdvance_CXXFLAGS = @GTKMM_CFLAGS@ @SDL_CFLAGS@ libgba_a_SOURCES = \ --- 181,185 ---- ! gvba_CXXFLAGS = @GTKMM_CFLAGS@ @SDL_CFLAGS@ libgba_a_SOURCES = \ *************** *** 278,303 **** libgba_a-unzip.$(OBJEXT) libgba_a_OBJECTS = $(am_libgba_a_OBJECTS) ! bin_PROGRAMS = gVisualBoyAdvance$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) ! am_gVisualBoyAdvance_OBJECTS = gVisualBoyAdvance-input.$(OBJEXT) \ ! gVisualBoyAdvance-main.$(OBJEXT) \ ! gVisualBoyAdvance-screenarea.$(OBJEXT) \ ! gVisualBoyAdvance-system.$(OBJEXT) \ ! gVisualBoyAdvance-tools.$(OBJEXT) \ ! gVisualBoyAdvance-window.$(OBJEXT) ! gVisualBoyAdvance_OBJECTS = $(am_gVisualBoyAdvance_OBJECTS) ! gVisualBoyAdvance_DEPENDENCIES = libgba.a ! gVisualBoyAdvance_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gVisualBoyAdvance-input.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gVisualBoyAdvance-main.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gVisualBoyAdvance-screenarea.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gVisualBoyAdvance-system.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gVisualBoyAdvance-tools.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gVisualBoyAdvance-window.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/libgba_a-2xSaI.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/libgba_a-Cheats.Po \ --- 281,305 ---- libgba_a-unzip.$(OBJEXT) libgba_a_OBJECTS = $(am_libgba_a_OBJECTS) ! bin_PROGRAMS = gvba$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) ! am_gvba_OBJECTS = gvba-configfile.$(OBJEXT) gvba-filters.$(OBJEXT) \ ! gvba-input.$(OBJEXT) gvba-main.$(OBJEXT) \ ! gvba-screenarea.$(OBJEXT) gvba-system.$(OBJEXT) \ ! gvba-tools.$(OBJEXT) gvba-window.$(OBJEXT) ! gvba_OBJECTS = $(am_gvba_OBJECTS) ! gvba_DEPENDENCIES = libgba.a ! gvba_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gvba-configfile.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gvba-filters.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gvba-input.Po ./$(DEPDIR)/gvba-main.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gvba-screenarea.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gvba-system.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gvba-tools.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/gvba-window.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/libgba_a-2xSaI.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/libgba_a-Cheats.Po \ *************** *** 344,352 **** CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ ! DIST_SOURCES = $(libgba_a_SOURCES) $(gVisualBoyAdvance_SOURCES) DATA = $(dist_pkgdata_DATA) DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.in Makefile.am ! SOURCES = $(libgba_a_SOURCES) $(gVisualBoyAdvance_SOURCES) all: all-am --- 346,354 ---- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ ! DIST_SOURCES = $(libgba_a_SOURCES) $(gvba_SOURCES) DATA = $(dist_pkgdata_DATA) DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.in Makefile.am ! SOURCES = $(libgba_a_SOURCES) $(gvba_SOURCES) all: all-am *************** *** 392,398 **** clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! gVisualBoyAdvance$(EXEEXT): $(gVisualBoyAdvance_OBJECTS) $(gVisualBoyAdvance_DEPENDENCIES) ! @rm -f gVisualBoyAdvance$(EXEEXT) ! $(CXXLINK) $(gVisualBoyAdvance_LDFLAGS) $(gVisualBoyAdvance_OBJECTS) $(gVisualBoyAdvance_LDADD) $(LIBS) mostlyclean-compile: --- 394,400 ---- clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! gvba$(EXEEXT): $(gvba_OBJECTS) $(gvba_DEPENDENCIES) ! @rm -f gvba$(EXEEXT) ! $(CXXLINK) $(gvba_LDFLAGS) $(gvba_OBJECTS) $(gvba_LDADD) $(LIBS) mostlyclean-compile: *************** *** 402,411 **** -rm -f *.tab.c ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gVisualBoyAdvance-input.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gVisualBoyAdvance-main.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gVisualBoyAdvance-screenarea.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gVisualBoyAdvance-system.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gVisualBoyAdvance-tools.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gVisualBoyAdvance-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgba_a-2xSaI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgba_a-Cheats.Po@am__quote@ --- 404,415 ---- -rm -f *.tab.c ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-configfile.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-filters.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-input.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-main.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-screenarea.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-system.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-tools.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgba_a-2xSaI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgba_a-Cheats.Po@am__quote@ *************** *** 1258,1392 **** @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgba_a_CPPFLAGS) $(CPPFLAGS) $(libgba_a_CXXFLAGS) $(CXXFLAGS) -c -o libgba_a-unzip.obj `if test -f '../unzip.cpp'; then $(CYGPATH_W) '../unzip.cpp'; else $(CYGPATH_W) '$(srcdir)/../unzip.cpp'; fi` ! gVisualBoyAdvance-input.o: input.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-input.o -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-input.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-input.o `test -f 'input.cpp' || echo '$(srcdir)/'`input.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-input.Tpo" "$(DEPDIR)/gVisualBoyAdvance-input.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-input.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='input.cpp' object='gVisualBoyAdvance-input.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-input.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-input.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-input.o `test -f 'input.cpp' || echo '$(srcdir)/'`input.cpp ! gVisualBoyAdvance-input.obj: input.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-input.obj -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-input.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-input.obj `if test -f 'input.cpp'; then $(CYGPATH_W) 'input.cpp'; else $(CYGPATH_W) '$(srcdir)/input.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-input.Tpo" "$(DEPDIR)/gVisualBoyAdvance-input.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-input.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='input.cpp' object='gVisualBoyAdvance-input.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-input.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-input.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-input.obj `if test -f 'input.cpp'; then $(CYGPATH_W) 'input.cpp'; else $(CYGPATH_W) '$(srcdir)/input.cpp'; fi` ! gVisualBoyAdvance-main.o: main.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-main.o -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-main.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-main.Tpo" "$(DEPDIR)/gVisualBoyAdvance-main.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-main.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='gVisualBoyAdvance-main.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-main.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-main.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp ! gVisualBoyAdvance-main.obj: main.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-main.obj -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-main.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-main.Tpo" "$(DEPDIR)/gVisualBoyAdvance-main.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-main.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='gVisualBoyAdvance-main.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-main.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-main.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` ! gVisualBoyAdvance-screenarea.o: screenarea.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-screenarea.o -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-screenarea.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-screenarea.o `test -f 'screenarea.cpp' || echo '$(srcdir)/'`screenarea.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-screenarea.Tpo" "$(DEPDIR)/gVisualBoyAdvance-screenarea.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-screenarea.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='screenarea.cpp' object='gVisualBoyAdvance-screenarea.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-screenarea.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-screenarea.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-screenarea.o `test -f 'screenarea.cpp' || echo '$(srcdir)/'`screenarea.cpp ! gVisualBoyAdvance-screenarea.obj: screenarea.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-screenarea.obj -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-screenarea.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-screenarea.obj `if test -f 'screenarea.cpp'; then $(CYGPATH_W) 'screenarea.cpp'; else $(CYGPATH_W) '$(srcdir)/screenarea.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-screenarea.Tpo" "$(DEPDIR)/gVisualBoyAdvance-screenarea.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-screenarea.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='screenarea.cpp' object='gVisualBoyAdvance-screenarea.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-screenarea.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-screenarea.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-screenarea.obj `if test -f 'screenarea.cpp'; then $(CYGPATH_W) 'screenarea.cpp'; else $(CYGPATH_W) '$(srcdir)/screenarea.cpp'; fi` ! gVisualBoyAdvance-system.o: system.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-system.o -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-system.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-system.o `test -f 'system.cpp' || echo '$(srcdir)/'`system.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-system.Tpo" "$(DEPDIR)/gVisualBoyAdvance-system.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-system.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='system.cpp' object='gVisualBoyAdvance-system.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-system.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-system.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-system.o `test -f 'system.cpp' || echo '$(srcdir)/'`system.cpp ! gVisualBoyAdvance-system.obj: system.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-system.obj -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-system.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-system.obj `if test -f 'system.cpp'; then $(CYGPATH_W) 'system.cpp'; else $(CYGPATH_W) '$(srcdir)/system.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-system.Tpo" "$(DEPDIR)/gVisualBoyAdvance-system.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-system.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='system.cpp' object='gVisualBoyAdvance-system.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-system.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-system.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-system.obj `if test -f 'system.cpp'; then $(CYGPATH_W) 'system.cpp'; else $(CYGPATH_W) '$(srcdir)/system.cpp'; fi` ! gVisualBoyAdvance-tools.o: tools.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-tools.o -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-tools.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-tools.o `test -f 'tools.cpp' || echo '$(srcdir)/'`tools.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-tools.Tpo" "$(DEPDIR)/gVisualBoyAdvance-tools.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-tools.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tools.cpp' object='gVisualBoyAdvance-tools.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-tools.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-tools.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-tools.o `test -f 'tools.cpp' || echo '$(srcdir)/'`tools.cpp ! gVisualBoyAdvance-tools.obj: tools.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-tools.obj -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-tools.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-tools.obj `if test -f 'tools.cpp'; then $(CYGPATH_W) 'tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tools.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-tools.Tpo" "$(DEPDIR)/gVisualBoyAdvance-tools.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-tools.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tools.cpp' object='gVisualBoyAdvance-tools.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-tools.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-tools.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-tools.obj `if test -f 'tools.cpp'; then $(CYGPATH_W) 'tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tools.cpp'; fi` ! gVisualBoyAdvance-window.o: window.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-window.o -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-window.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-window.o `test -f 'window.cpp' || echo '$(srcdir)/'`window.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-window.Tpo" "$(DEPDIR)/gVisualBoyAdvance-window.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-window.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='window.cpp' object='gVisualBoyAdvance-window.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-window.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-window.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-window.o `test -f 'window.cpp' || echo '$(srcdir)/'`window.cpp ! gVisualBoyAdvance-window.obj: window.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -MT gVisualBoyAdvance-window.obj -MD -MP -MF "$(DEPDIR)/gVisualBoyAdvance-window.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gVisualBoyAdvance-window.obj `if test -f 'window.cpp'; then $(CYGPATH_W) 'window.cpp'; else $(CYGPATH_W) '$(srcdir)/window.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gVisualBoyAdvance-window.Tpo" "$(DEPDIR)/gVisualBoyAdvance-window.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gVisualBoyAdvance-window.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='window.cpp' object='gVisualBoyAdvance-window.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gVisualBoyAdvance-window.Po' tmpdepfile='$(DEPDIR)/gVisualBoyAdvance-window.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gVisualBoyAdvance_CPPFLAGS) $(CPPFLAGS) $(gVisualBoyAdvance_CXXFLAGS) $(CXXFLAGS) -c -o gVisualBoyAdvance-window.obj `if test -f 'window.cpp'; then $(CYGPATH_W) 'window.cpp'; else $(CYGPATH_W) '$(srcdir)/window.cpp'; fi` uninstall-info-am: dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) --- 1262,1440 ---- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgba_a_CPPFLAGS) $(CPPFLAGS) $(libgba_a_CXXFLAGS) $(CXXFLAGS) -c -o libgba_a-unzip.obj `if test -f '../unzip.cpp'; then $(CYGPATH_W) '../unzip.cpp'; else $(CYGPATH_W) '$(srcdir)/../unzip.cpp'; fi` ! gvba-configfile.o: configfile.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-configfile.o -MD -MP -MF "$(DEPDIR)/gvba-configfile.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-configfile.o `test -f 'configfile.cpp' || echo '$(srcdir)/'`configfile.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-configfile.Tpo" "$(DEPDIR)/gvba-configfile.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-configfile.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='configfile.cpp' object='gvba-configfile.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-configfile.Po' tmpdepfile='$(DEPDIR)/gvba-configfile.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-configfile.o `test -f 'configfile.cpp' || echo '$(srcdir)/'`configfile.cpp ! gvba-configfile.obj: configfile.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-configfile.obj -MD -MP -MF "$(DEPDIR)/gvba-configfile.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-configfile.obj `if test -f 'configfile.cpp'; then $(CYGPATH_W) 'configfile.cpp'; else $(CYGPATH_W) '$(srcdir)/configfile.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-configfile.Tpo" "$(DEPDIR)/gvba-configfile.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-configfile.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='configfile.cpp' object='gvba-configfile.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-configfile.Po' tmpdepfile='$(DEPDIR)/gvba-configfile.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-configfile.obj `if test -f 'configfile.cpp'; then $(CYGPATH_W) 'configfile.cpp'; else $(CYGPATH_W) '$(srcdir)/configfile.cpp'; fi` ! gvba-filters.o: filters.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-filters.o -MD -MP -MF "$(DEPDIR)/gvba-filters.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-filters.o `test -f 'filters.cpp' || echo '$(srcdir)/'`filters.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-filters.Tpo" "$(DEPDIR)/gvba-filters.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-filters.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='filters.cpp' object='gvba-filters.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-filters.Po' tmpdepfile='$(DEPDIR)/gvba-filters.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-filters.o `test -f 'filters.cpp' || echo '$(srcdir)/'`filters.cpp ! gvba-filters.obj: filters.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-filters.obj -MD -MP -MF "$(DEPDIR)/gvba-filters.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-filters.obj `if test -f 'filters.cpp'; then $(CYGPATH_W) 'filters.cpp'; else $(CYGPATH_W) '$(srcdir)/filters.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-filters.Tpo" "$(DEPDIR)/gvba-filters.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-filters.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='filters.cpp' object='gvba-filters.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-filters.Po' tmpdepfile='$(DEPDIR)/gvba-filters.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-filters.obj `if test -f 'filters.cpp'; then $(CYGPATH_W) 'filters.cpp'; else $(CYGPATH_W) '$(srcdir)/filters.cpp'; fi` ! gvba-input.o: input.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-input.o -MD -MP -MF "$(DEPDIR)/gvba-input.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-input.o `test -f 'input.cpp' || echo '$(srcdir)/'`input.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-input.Tpo" "$(DEPDIR)/gvba-input.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-input.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='input.cpp' object='gvba-input.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-input.Po' tmpdepfile='$(DEPDIR)/gvba-input.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-input.o `test -f 'input.cpp' || echo '$(srcdir)/'`input.cpp ! gvba-input.obj: input.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-input.obj -MD -MP -MF "$(DEPDIR)/gvba-input.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-input.obj `if test -f 'input.cpp'; then $(CYGPATH_W) 'input.cpp'; else $(CYGPATH_W) '$(srcdir)/input.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-input.Tpo" "$(DEPDIR)/gvba-input.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-input.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='input.cpp' object='gvba-input.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-input.Po' tmpdepfile='$(DEPDIR)/gvba-input.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-input.obj `if test -f 'input.cpp'; then $(CYGPATH_W) 'input.cpp'; else $(CYGPATH_W) '$(srcdir)/input.cpp'; fi` ! gvba-main.o: main.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-main.o -MD -MP -MF "$(DEPDIR)/gvba-main.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-main.Tpo" "$(DEPDIR)/gvba-main.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-main.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='gvba-main.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-main.Po' tmpdepfile='$(DEPDIR)/gvba-main.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp ! gvba-main.obj: main.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-main.obj -MD -MP -MF "$(DEPDIR)/gvba-main.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-main.Tpo" "$(DEPDIR)/gvba-main.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-main.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='gvba-main.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-main.Po' tmpdepfile='$(DEPDIR)/gvba-main.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` ! gvba-screenarea.o: screenarea.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-screenarea.o -MD -MP -MF "$(DEPDIR)/gvba-screenarea.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-screenarea.o `test -f 'screenarea.cpp' || echo '$(srcdir)/'`screenarea.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-screenarea.Tpo" "$(DEPDIR)/gvba-screenarea.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-screenarea.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='screenarea.cpp' object='gvba-screenarea.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-screenarea.Po' tmpdepfile='$(DEPDIR)/gvba-screenarea.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-screenarea.o `test -f 'screenarea.cpp' || echo '$(srcdir)/'`screenarea.cpp ! gvba-screenarea.obj: screenarea.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-screenarea.obj -MD -MP -MF "$(DEPDIR)/gvba-screenarea.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-screenarea.obj `if test -f 'screenarea.cpp'; then $(CYGPATH_W) 'screenarea.cpp'; else $(CYGPATH_W) '$(srcdir)/screenarea.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-screenarea.Tpo" "$(DEPDIR)/gvba-screenarea.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-screenarea.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='screenarea.cpp' object='gvba-screenarea.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-screenarea.Po' tmpdepfile='$(DEPDIR)/gvba-screenarea.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-screenarea.obj `if test -f 'screenarea.cpp'; then $(CYGPATH_W) 'screenarea.cpp'; else $(CYGPATH_W) '$(srcdir)/screenarea.cpp'; fi` ! gvba-system.o: system.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-system.o -MD -MP -MF "$(DEPDIR)/gvba-system.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-system.o `test -f 'system.cpp' || echo '$(srcdir)/'`system.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-system.Tpo" "$(DEPDIR)/gvba-system.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-system.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='system.cpp' object='gvba-system.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-system.Po' tmpdepfile='$(DEPDIR)/gvba-system.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-system.o `test -f 'system.cpp' || echo '$(srcdir)/'`system.cpp ! gvba-system.obj: system.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-system.obj -MD -MP -MF "$(DEPDIR)/gvba-system.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-system.obj `if test -f 'system.cpp'; then $(CYGPATH_W) 'system.cpp'; else $(CYGPATH_W) '$(srcdir)/system.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-system.Tpo" "$(DEPDIR)/gvba-system.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-system.Tpo"; exit 1; \ @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='system.cpp' object='gvba-system.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-system.Po' tmpdepfile='$(DEPDIR)/gvba-system.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-system.obj `if test -f 'system.cpp'; then $(CYGPATH_W) 'system.cpp'; else $(CYGPATH_W) '$(srcdir)/system.cpp'; fi` ! ! gvba-tools.o: tools.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-tools.o -MD -MP -MF "$(DEPDIR)/gvba-tools.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-tools.o `test -f 'tools.cpp' || echo '$(srcdir)/'`tools.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-tools.Tpo" "$(DEPDIR)/gvba-tools.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-tools.Tpo"; exit 1; \ ! @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tools.cpp' object='gvba-tools.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-tools.Po' tmpdepfile='$(DEPDIR)/gvba-tools.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-tools.o `test -f 'tools.cpp' || echo '$(srcdir)/'`tools.cpp ! ! gvba-tools.obj: tools.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-tools.obj -MD -MP -MF "$(DEPDIR)/gvba-tools.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-tools.obj `if test -f 'tools.cpp'; then $(CYGPATH_W) 'tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tools.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-tools.Tpo" "$(DEPDIR)/gvba-tools.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-tools.Tpo"; exit 1; \ ! @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tools.cpp' object='gvba-tools.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-tools.Po' tmpdepfile='$(DEPDIR)/gvba-tools.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-tools.obj `if test -f 'tools.cpp'; then $(CYGPATH_W) 'tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tools.cpp'; fi` ! ! gvba-window.o: window.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-window.o -MD -MP -MF "$(DEPDIR)/gvba-window.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-window.o `test -f 'window.cpp' || echo '$(srcdir)/'`window.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-window.Tpo" "$(DEPDIR)/gvba-window.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-window.Tpo"; exit 1; \ ! @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='window.cpp' object='gvba-window.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-window.Po' tmpdepfile='$(DEPDIR)/gvba-window.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-window.o `test -f 'window.cpp' || echo '$(srcdir)/'`window.cpp ! ! gvba-window.obj: window.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-window.obj -MD -MP -MF "$(DEPDIR)/gvba-window.Tpo" \ ! @am__fastdepCXX_TRUE@ -c -o gvba-window.obj `if test -f 'window.cpp'; then $(CYGPATH_W) 'window.cpp'; else $(CYGPATH_W) '$(srcdir)/window.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/gvba-window.Tpo" "$(DEPDIR)/gvba-window.Po"; \ ! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/gvba-window.Tpo"; exit 1; \ ! @am__fastdepCXX_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='window.cpp' object='gvba-window.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/gvba-window.Po' tmpdepfile='$(DEPDIR)/gvba-window.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-window.obj `if test -f 'window.cpp'; then $(CYGPATH_W) 'window.cpp'; else $(CYGPATH_W) '$(srcdir)/window.cpp'; fi` uninstall-info-am: dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) Index: window.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/window.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** window.cpp 29 Mar 2004 22:08:40 -0000 1.1 --- window.cpp 2 Apr 2004 01:22:17 -0000 1.2 *************** *** 19,22 **** --- 19,25 ---- #include "window.h" + #include <sys/types.h> + #include <sys/stat.h> + #include <SDL.h> *************** *** 52,63 **** m_uiJoypadState(0), m_iScreenWidth(iGBAScreenWidth), ! m_iScreenHeight(iGBAScreenHeight), ! m_iScreenScale(1), ! m_vFilter2x(NULL), ! m_vFilterIB(NULL) { vInitSystem(); vInitSDL(); - vLoadKeymap(); Gtk::Container * poC; --- 55,62 ---- m_uiJoypadState(0), m_iScreenWidth(iGBAScreenWidth), ! m_iScreenHeight(iGBAScreenHeight) { vInitSystem(); vInitSDL(); Gtk::Container * poC; *************** *** 66,76 **** poC->add(*m_poScreenArea); vDrawDefaultScreen(); - m_poScreenArea->vSetFilter2x(SuperEagle32); // TEST m_poScreenArea->show(); m_poFilePauseItem = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget("FilePause")); ! m_poFilePauseItem->signal_toggled().connect(SigC::slot(*this, &Window::vOnFilePause)); - Gtk::MenuItem * poMI; poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileOpen")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileOpen)); --- 65,100 ---- poC->add(*m_poScreenArea); vDrawDefaultScreen(); m_poScreenArea->show(); + // Get config + // + vInitConfig(); + + m_sUserDataDir = Glib::get_home_dir() + "/.gvba"; + m_sConfigFile = m_sUserDataDir + "/config"; + + if (! Glib::file_test(m_sUserDataDir, Glib::FILE_TEST_EXISTS)) + { + mkdir(m_sUserDataDir.c_str(), 0777); + } + if (Glib::file_test(m_sConfigFile, Glib::FILE_TEST_EXISTS)) + { + vLoadConfig(m_sConfigFile); + } + else + { + vSaveConfig(m_sConfigFile); + } + + vLoadKeymap(); + + Gtk::MenuItem * poMI; + Gtk::CheckMenuItem * poCMI; + + // File menu + // m_poFilePauseItem = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget("FilePause")); ! m_poFilePauseItem->signal_toggled().connect(SigC::slot(*this, &Window::vOnFilePauseToggled)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileOpen")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileOpen)); *************** *** 79,93 **** poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileClose")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileClose)); ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileQuit")); ! poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileQuit)); ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoZoom1x")); ! poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnVideoZoom1x)); ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoZoom2x")); ! poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnVideoZoom2x)); ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoZoom3x")); ! poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnVideoZoom3x)); ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoZoom4x")); ! poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnVideoZoom4x)); poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("HelpAbout")); --- 103,300 ---- poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileClose")); poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileClose)); ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileExit")); ! poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnFileExit)); ! // Frameskip menu ! // ! struct ! { ! const char * m_csName; ! int m_iFrameskip; ! } ! astFrameskip[] = ! { ! { "FrameskipAutomatic", -1 }, ! { "Frameskip0", 0 }, ! { "Frameskip1", 1 }, ! { "Frameskip2", 2 }, ! { "Frameskip3", 3 }, ! { "Frameskip4", 4 }, ! { "Frameskip5", 5 }, ! { "Frameskip6", 6 }, ! { "Frameskip7", 7 }, ! { "Frameskip8", 8 }, ! { "Frameskip9", 9 } ! }; ! int iDefaultFrameskip; ! if (m_poScreenConfig->sGetKey("frameskip") == "auto") ! { ! iDefaultFrameskip = -1; ! } ! else ! { ! iDefaultFrameskip = m_poScreenConfig->oGetKey<int>("frameskip"); ! } ! for (guint i = 0; i < sizeof(astFrameskip) / sizeof(astFrameskip[0]); i++) ! { ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget(astFrameskip[i].m_csName)); ! poMI->signal_activate().connect(SigC::bind<int>(SigC::slot(*this, &Window::vOnFrameskipSelected), ! astFrameskip[i].m_iFrameskip)); ! if (astFrameskip[i].m_iFrameskip == iDefaultFrameskip) ! { ! poMI->activate(); ! } ! } ! ! // Throttle menu ! // ! struct ! { ! const char * m_csName; ! int m_iThrottle; ! } ! astThrottle[] = ! { ! { "ThrottleNoThrottle", 0 }, ! { "Throttle25", 25 }, ! { "Throttle50", 50 }, ! { "Throttle100", 100 }, ! { "Throttle150", 150 }, ! { "Throttle200", 200 } ! }; ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("ThrottleOther")); ! poMI->activate(); ! poMI->signal_activate().connect(SigC::slot(*this, &Window::vOnThrottleOther)); ! ! int iDefaultThrottle = m_poScreenConfig->oGetKey<int>("throttle"); ! for (guint i = 0; i < sizeof(astThrottle) / sizeof(astThrottle[0]); i++) ! { ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget(astThrottle[i].m_csName)); ! if (astThrottle[i].m_iThrottle == iDefaultThrottle) ! { ! poMI->activate(); ! } ! poMI->signal_activate().connect(SigC::bind<int>(SigC::slot(*this, &Window::vOnThrottleSelected), ! astThrottle[i].m_iThrottle)); ! } ! vSetThrottle(iDefaultThrottle); ! ! // Video menu ! // ! struct ! { ! const char * m_csName; ! int m_iScale; ! } ! astVideoScale[] = ! { ! { "Video1x", 1 }, ! { "Video2x", 2 }, ! { "Video3x", 3 }, ! { "Video4x", 4 }, ! { "Video5x", 5 }, ! { "Video6x", 6 } ! }; ! int iDefaultScale = m_poScreenConfig->oGetKey<int>("scale"); ! for (guint i = 0; i < sizeof(astVideoScale) / sizeof(astVideoScale[0]); i++) ! { ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget(astVideoScale[i].m_csName)); ! poMI->signal_activate().connect(SigC::bind<int>(SigC::slot(*this, &Window::vOnVideoScaleSelected), ! astVideoScale[i].m_iScale)); ! if (astVideoScale[i].m_iScale == iDefaultScale) ! { ! poMI->activate(); ! } ! } ! ! // Layers menu ! // ! struct ! { ! const char * m_csName; ! int m_iLayer; ! bool m_bChecked; ! } ! astLayer[] = ! { ! { "LayersBg0", 0, m_poScreenConfig->oGetKey<bool>("layer_bg0") }, ! { "LayersBg1", 1, m_poScreenConfig->oGetKey<bool>("layer_bg1") }, ! { "LayersBg2", 2, m_poScreenConfig->oGetKey<bool>("layer_bg2") }, ! { "LayersBg3", 3, m_poScreenConfig->oGetKey<bool>("layer_bg3") }, ! { "LayersObj", 4, m_poScreenConfig->oGetKey<bool>("layer_obj") }, ! { "LayersWin0", 5, m_poScreenConfig->oGetKey<bool>("layer_win0") }, ! { "LayersWin1", 6, m_poScreenConfig->oGetKey<bool>("layer_win1") }, ! { "LayersObjWin", 7, m_poScreenConfig->oGetKey<bool>("layer_objwin") } ! }; ! for (guint i = 0; i < sizeof(astLayer) / sizeof(astLayer[0]); i++) ! { ! poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astLayer[i].m_csName)); ! poCMI->set_active(astLayer[i].m_bChecked); ! vSetLayer(astLayer[i].m_iLayer, astLayer[i].m_bChecked); ! poCMI->signal_toggled().connect(SigC::bind<Gtk::CheckMenuItem *, int>( ! SigC::slot(*this, &Window::vOnLayerToggled), ! poCMI, astLayer[i].m_iLayer)); ! } ! ! // Filter menu ! // ! struct ! { ! const char * m_csName; ! EFilter2x m_eFilter2x; ! } ! astFilter2x[] = ! { ! { "FilterNone", FilterNone }, ! { "FilterTVMode", FilterScanlinesTV }, ! { "Filter2xSaI", Filter2xSaI }, ! { "FilterSuper2xSaI", FilterSuper2xSaI }, ! { "FilterSuperEagle", FilterSuperEagle }, ! { "FilterPixelate", FilterPixelate }, ! { "FilterMotionBlur", FilterMotionBlur }, ! { "FilterAdvanceMame2x", FilterAdMame2x }, ! { "FilterSimple2x", FilterSimple2x }, ! { "FilterBilinear", FilterBilinear }, ! { "FilterBilinearPlus", FilterBilinearPlus }, ! { "FilterScanlines", FilterScanlines }, ! { "FilterHq2x", FilterHq2x }, ! { "FilterLq2x", FilterLq2x } ! }; ! EFilter2x eDefaultFilter2x = (EFilter2x)m_poScreenConfig->oGetKey<int>("filter2x"); ! for (guint i = 0; i < sizeof(astFilter2x) / sizeof(astFilter2x[0]); i++) ! { ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget(astFilter2x[i].m_csName)); ! poMI->signal_activate().connect(SigC::bind<EFilter2x>(SigC::slot(*this, &Window::vOnFilter2xSelected), ! astFilter2x[i].m_eFilter2x)); ! if (astFilter2x[i].m_eFilter2x == eDefaultFilter2x) ! { ! poMI->activate(); ! } ! } ! ! // Interframe blending menu ! // ! struct ! { ! const char * m_csName; ! EFilterIB m_eFilterIB; ! } ! astFilterIB[] = ! { ! { "IFBNone", FilterIBNone }, ! { "IFBSmart", FilterIBSmart }, ! { "IFBMotionBlur", FilterIBMotionBlur } ! }; ! EFilterIB eDefaultFilterIB = (EFilterIB)m_poScreenConfig->oGetKey<int>("filterIB"); ! for (guint i = 0; i < sizeof(astFilterIB) / sizeof(astFilterIB[0]); i++) ! { ! poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget(astFilterIB[i].m_csName)); ! poMI->signal_activate().connect(SigC::bind<EFilterIB>(SigC::slot(*this, &Window::vOnFilterIBSelected), ! astFilterIB[i].m_eFilterIB)); ! if (astFilterIB[i].m_eFilterIB == eDefaultFilterIB) ! { ! poMI->activate(); ! } ! } poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("HelpAbout")); *************** *** 107,110 **** --- 314,318 ---- { vOnFileClose(); + vSaveConfig(m_sConfigFile); if (m_poFileOpenDialog != NULL) *************** *** 136,140 **** systemVerbose = 0; systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; ! systemFrameSkip = 5; // TEST systemSoundOn = false; --- 344,348 ---- systemVerbose = 0; systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; ! systemFrameSkip = 0; systemSoundOn = false; *************** *** 157,160 **** --- 365,369 ---- } + gbFrameSkip = 0; // TODO : GB init and 16-bit color map (?) } *************** *** 168,172 **** int iFlags = (SDL_INIT_AUDIO ! | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE); --- 377,381 ---- int iFlags = (SDL_INIT_AUDIO ! | SDL_INIT_TIMER // useful for SDL_GetTicks ? | SDL_INIT_NOPARACHUTE); *************** *** 180,183 **** --- 389,446 ---- } + void Window::vInitConfig() + { + m_oConfig.vClear(); + + m_poScreenConfig = m_oConfig.poAddSection("Screen"); + m_poScreenConfig->vSetKey ("frameskip", "auto" ); + m_poScreenConfig->vSetKey ("throttle", 0 ); + m_poScreenConfig->vSetKey ("scale", 1 ); + m_poScreenConfig->vSetKey ("layer_bg0", true ); + m_poScreenConfig->vSetKey ("layer_bg1", true ); + m_poScreenConfig->vSetKey ("layer_bg2", true ); + m_poScreenConfig->vSetKey ("layer_bg3", true ); + m_poScreenConfig->vSetKey ("layer_obj", true ); + m_poScreenConfig->vSetKey ("layer_win0", true ); + m_poScreenConfig->vSetKey ("layer_win1", true ); + m_poScreenConfig->vSetKey ("layer_objwin", true ); + m_poScreenConfig->vSetKey<int>("filter2x", FilterNone ); + m_poScreenConfig->vSetKey<int>("filterIB", FilterIBNone ); + } + + void Window::vLoadConfig(const std::string & _sFilename) + { + try + { + m_oConfig.vLoad(_sFilename); + } + catch (const Glib::Error & e) + { + Gtk::MessageDialog oDialog(*this, + e.what(), + Gtk::MESSAGE_ERROR, + Gtk::BUTTONS_CLOSE); + oDialog.run(); + } + + // TODO : check that values are valid + } + + void Window::vSaveConfig(const std::string & _sFilename) + { + try + { + m_oConfig.vSave(_sFilename); + } + catch (const Glib::Error & e) + { + Gtk::MessageDialog oDialog(*this, + e.what(), + Gtk::MESSAGE_ERROR, + Gtk::BUTTONS_CLOSE); + oDialog.run(); + } + } + void Window::vLoadKeymap() { *************** *** 204,213 **** void Window::vUpdateScreen() { ! g_return_if_fail(m_iScreenWidth >= 1 ! && m_iScreenHeight >= 1 ! && m_iScreenScale >= 1); m_poScreenArea->vSetSize(m_iScreenWidth, m_iScreenHeight); ! m_poScreenArea->vSetScale(m_iScreenScale); resize(1, 1); --- 467,474 ---- void Window::vUpdateScreen() { ! g_return_if_fail(m_iScreenWidth >= 1 && m_iScreenHeight >= 1); m_poScreenArea->vSetSize(m_iScreenWidth, m_iScreenHeight); ! m_poScreenArea->vSetScale(m_poScreenConfig->oGetKey<int>("scale")); resize(1, 1); *************** *** 237,241 **** vOnFileClose(); ! m_sFilename = _rsFilename; const char * csFilename = _rsFilename.c_str(); --- 498,502 ---- vOnFileClose(); ! m_sRomFile = _rsFilename; const char * csFilename = _rsFilename.c_str(); *************** *** 282,288 **** gbBorderRowSkip = 0; } - - // TODO - //systemFrameSkip = gbFrameSkip; } } --- 543,546 ---- *************** *** 314,320 **** m_iScreenWidth = iGBAScreenWidth; m_iScreenHeight = iGBAScreenHeight; - - // TODO - //systemFrameSkip = frameSkip; } } --- 572,575 ---- *************** *** 347,351 **** // TODO : from battery dir ! std::string sBattery = sCutSuffix(m_sFilename) + ".sav"; if (m_stEmulator.emuReadBattery(sBattery.c_str())) { --- 602,606 ---- // TODO : from battery dir ! std::string sBattery = sCutSuffix(m_sRomFile) + ".sav"; if (m_stEmulator.emuReadBattery(sBattery.c_str())) { *************** *** 358,362 **** // TODO : from battery dir ! std::string sBattery = sCutSuffix(m_sFilename) + ".sav"; if (m_stEmulator.emuWriteBattery(sBattery.c_str())) { --- 613,617 ---- // TODO : from battery dir ! std::string sBattery = sCutSuffix(m_sRomFile) + ".sav"; if (m_stEmulator.emuWriteBattery(sBattery.c_str())) { *************** *** 391,394 **** --- 646,682 ---- } + void Window::vSetThrottle(int _iPercent) + { + // TODO + m_poScreenConfig->vSetKey("throttle", _iPercent); + } + + void Window::vSetLayer(int _iLayer, bool _bVisible) + { + int iMask = (0x0100 << _iLayer); + if (_bVisible) + { + layerSettings |= iMask; + } + else + { + layerSettings &= ~iMask; + } + layerEnable = DISPCNT & layerSettings; + + const char * acsLayers[] = + { + "layer_bg0", + "layer_bg1", + "layer_bg2", + "layer_bg3", + "layer_obj", + "layer_win0", + "layer_win1", + "layer_objwin" + }; + m_poScreenConfig->vSetKey(acsLayers[_iLayer], _bVisible); + } + void Window::vOnFileOpen() { *************** *** 396,409 **** { m_poFileOpenDialog = new Gtk::FileSelection(_("Open a ROM")); } m_poFileOpenDialog->show(); ! int iResponse = m_poFileOpenDialog->run(); ! if (iResponse == Gtk::RESPONSE_OK) { ! if (! bLoadROM(m_poFileOpenDialog->get_filename())) { ! return; } } --- 684,697 ---- { m_poFileOpenDialog = new Gtk::FileSelection(_("Open a ROM")); + m_poFileOpenDialog->set_transient_for(*this); } m_poFileOpenDialog->show(); ! while (m_poFileOpenDialog->run() == Gtk::RESPONSE_OK) { ! if (bLoadROM(m_poFileOpenDialog->get_filename())) { ! break; } } *************** *** 412,416 **** } ! void Window::vOnFilePause() { if (emulating) --- 700,704 ---- } ! void Window::vOnFilePauseToggled() { if (emulating) *************** *** 450,482 **** } ! void Window::vOnFileQuit() { hide(); } ! void Window::vOnVideoZoom1x() { ! m_iScreenScale = 1; ! vUpdateScreen(); } ! void Window::vOnVideoZoom2x() {... [truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X