[vba-commit] VisualBoyAdvance/win32 Makefile.am,1.1,1.2 Makefile.in,1.6,1.7 gba_sdl.dsp,1.11,1.12 gba_sdl.vcproj,1.2,1.3

[S?bastien G. <kx...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551/win32

Modified Files:
	Makefile.am Makefile.in gba_sdl.dsp gba_sdl.vcproj 
Log Message:
GTK+ frontend draft added.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/win32/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in	1 Feb 2004 15:02:39 -0000	1.6
--- Makefile.in	29 Mar 2004 22:08:56 -0000	1.7
***************
*** 1,3 ****
! # Makefile.in generated by automake 1.7.8 from Makefile.am.
  # @configure_input@
  
--- 1,3 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
  # @configure_input@
  
***************
*** 61,76 ****
--- 61,88 ----
  EGREP = @EGREP@
  EXEEXT = @EXEEXT@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GMSGFMT = @GMSGFMT@
+ GTKMM_CFLAGS = @GTKMM_CFLAGS@
+ GTKMM_LIBS = @GTKMM_LIBS@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INTLLIBS = @INTLLIBS@
  LDFLAGS = @LDFLAGS@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBINTL = @LTLIBINTL@
  LTLIBOBJS = @LTLIBOBJS@
  MAKEINFO = @MAKEINFO@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGMERGE = @MSGMERGE@
  NASM = @NASM@
  OBJEXT = @OBJEXT@
***************
*** 82,85 ****
--- 94,99 ----
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ POSUB = @POSUB@
  RANLIB = @RANLIB@
  SDL_CFLAGS = @SDL_CFLAGS@
***************
*** 89,100 ****
  SHELL = @SHELL@
  STRIP = @STRIP@
  VBA_EXTRA = @VBA_EXTRA@
! VBA_MMX = @VBA_MMX@
! VBA_PROF = @VBA_PROF@
  VERSION = @VERSION@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
- ac_ct_NASM = @ac_ct_NASM@
  ac_ct_RANLIB = @ac_ct_RANLIB@
  ac_ct_STRIP = @ac_ct_STRIP@
--- 103,114 ----
  SHELL = @SHELL@
  STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
  VBA_EXTRA = @VBA_EXTRA@
! VBA_LIBS = @VBA_LIBS@
  VERSION = @VERSION@
+ XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
  ac_ct_RANLIB = @ac_ct_RANLIB@
  ac_ct_STRIP = @ac_ct_STRIP@
***************
*** 138,142 ****
  target_vendor = @target_vendor@
  EXTRA_DIST = \
! 	gba_sdl.dsp gba_sdl.dsw GBA.dsp GBA.dsw SDL-1.2.2 lib include
  
  subdir = win32
--- 152,166 ----
  target_vendor = @target_vendor@
  EXTRA_DIST = \
! 	gba_sdl.dsp	\
! 	gba_sdl.dsw	\
! 	gba_sdl.sln	\
! 	gba_sdl.vcproj	\
! 	GBA.dsp		\
! 	GBA.dsw		\
! 	gba.sln		\
! 	GBA.vcproj	\
! 	SDL-1.2.2	\
! 	lib		\
! 	include
  
  subdir = win32
***************
*** 212,216 ****
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! 	  INSTALL_STRIP_FLAG=-s \
  	  `test -z '$(STRIP)' || \
  	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 236,240 ----
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  	  `test -z '$(STRIP)' || \
  	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
***************
*** 280,286 ****
  
  dist-hook:
! 	rm -rf `find $(distdir)/SDL-1.2.2 -name CVS`
! 	rm -rf `find $(distdir)/lib -name CVS`
! 	rm -rf `find $(distdir)/include -name CVS`
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
--- 304,308 ----
  
  dist-hook:
! 	rm -rf `find $(distdir) -name CVS`
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/win32/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	20 Oct 2002 13:03:12 -0000	1.1
--- Makefile.am	29 Mar 2004 22:08:41 -0000	1.2
***************
*** 1,7 ****
  EXTRA_DIST = \
! 	gba_sdl.dsp gba_sdl.dsw GBA.dsp GBA.dsw SDL-1.2.2 lib include
  
  dist-hook:
! 	rm -rf `find $(distdir)/SDL-1.2.2 -name CVS`
! 	rm -rf `find $(distdir)/lib -name CVS`
! 	rm -rf `find $(distdir)/include -name CVS`
--- 1,15 ----
  EXTRA_DIST = \
! 	gba_sdl.dsp	\
! 	gba_sdl.dsw	\
! 	gba_sdl.sln	\
! 	gba_sdl.vcproj	\
! 	GBA.dsp		\
! 	GBA.dsw		\
! 	gba.sln		\
! 	GBA.vcproj	\
! 	SDL-1.2.2	\
! 	lib		\
! 	include
  
  dist-hook:
! 	rm -rf `find $(distdir) -name CVS`

Index: gba_sdl.dsp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/win32/gba_sdl.dsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gba_sdl.dsp	5 Feb 2004 11:42:36 -0000	1.11
--- gba_sdl.dsp	29 Mar 2004 22:08:56 -0000	1.12
***************
*** 43,47 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "include/zlib" /I "include/png" /I "SDL-1.2.2/include" /D "NDEBUG" /D "FINAL_VERSION" /D "DEV_VERSION" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BKPT_SUPPORT" /D "MMX" /D "SDL" /D "PROFILING" /YX /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
--- 43,47 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../src" /I "include/zlib" /I "include/png" /I "SDL-1.2.2/include" /D "NDEBUG" /D "FINAL_VERSION" /D "DEV_VERSION" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BKPT_SUPPORT" /D "MMX" /D "SDL" /D "PROFILING" /YX /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 68,72 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "include/zlib" /I "include/png" /I "SDL-1.2.2/include" /D "_DEBUG" /D "DEV_VERSION" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BKPT_SUPPORT" /D "MMX" /D "SDL" /D "PROFILING" /YX /FD /GZ /c
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
--- 68,72 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "include/zlib" /I "include/png" /I "SDL-1.2.2/include" /D "_DEBUG" /D "DEV_VERSION" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BKPT_SUPPORT" /D "MMX" /D "SDL" /D "PROFILING" /YX /FD /GZ /c
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 266,270 ****
  # Begin Source File
  
! SOURCE=..\src\debugger.cpp
  # End Source File
  # Begin Source File
--- 266,270 ----
  # Begin Source File
  
! SOURCE=..\src\sdl\debugger.cpp
  # End Source File
  # Begin Source File
***************
*** 298,302 ****
  # Begin Source File
  
! SOURCE=..\src\SDL.cpp
  # End Source File
  # Begin Source File
--- 298,302 ----
  # Begin Source File
  
! SOURCE=..\src\sdl\SDL.cpp
  # End Source File
  # Begin Source File

Index: gba_sdl.vcproj
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/win32/gba_sdl.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gba_sdl.vcproj	7 Feb 2004 15:07:18 -0000	1.2
--- gba_sdl.vcproj	29 Mar 2004 22:08:56 -0000	1.3
***************
*** 23,27 ****
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="include/zlib,include/png,SDL-1.2.2/include"
  				PreprocessorDefinitions="_DEBUG,DEV_VERSION,WIN32,_CONSOLE,BKPT_SUPPORT,MMX,SDL,PROFILING"
  				BasicRuntimeChecks="3"
--- 23,27 ----
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="../src,include/zlib,include/png,SDL-1.2.2/include"
  				PreprocessorDefinitions="_DEBUG,DEV_VERSION,WIN32,_CONSOLE,BKPT_SUPPORT,MMX,SDL,PROFILING"
  				BasicRuntimeChecks="3"
***************
*** 81,85 ****
  				Optimization="2"
  				InlineFunctionExpansion="2"
! 				AdditionalIncludeDirectories="include/zlib,include/png,SDL-1.2.2/include"
  				PreprocessorDefinitions="NDEBUG,FINAL_VERSION,DEV_VERSION,WIN32,_CONSOLE,BKPT_SUPPORT,MMX,SDL,PROFILING"
  				StringPooling="TRUE"
--- 81,85 ----
  				Optimization="2"
  				InlineFunctionExpansion="2"
! 				AdditionalIncludeDirectories="../src,include/zlib,include/png,SDL-1.2.2/include"
  				PreprocessorDefinitions="NDEBUG,FINAL_VERSION,DEV_VERSION,WIN32,_CONSOLE,BKPT_SUPPORT,MMX,SDL,PROFILING"
  				StringPooling="TRUE"
***************
*** 255,259 ****
  				Filter="">
  				<File
! 					RelativePath="..\src\SDL.cpp">
  				</File>
  				<File
--- 255,259 ----
  				Filter="">
  				<File
! 					RelativePath="..\src\sdl\SDL.cpp">
  				</File>
  				<File
***************
*** 264,268 ****
  				</File>
  				<File
! 					RelativePath="..\src\debugger.cpp">
  				</File>
  				<File
--- 264,268 ----
  				</File>
  				<File
! 					RelativePath="..\src\sdl\debugger.cpp">
  				</File>
  				<File