Thread: [vba-commit] VisualBoyAdvance/src Makefile.am,1.17,1.18 Makefile.in,1.20,1.21 Util.cpp,1.22,1.23 rem

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Makefile.am Makefile.in Util.cpp remote.cpp 
Log Message:
Updated env macros, using WIN32 when more appropriate. Added SDL_QUIT event support. VisualBoyAdvance.cfg is now installed in sysconfdir (*/etc).

Index: Makefile.in
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile.in	12 May 2004 01:07:05 -0000	1.20
--- Makefile.in	20 May 2004 21:01:28 -0000	1.21
***************
*** 161,167 ****
  DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)

  EXTRA_DIST = \
  	win32			\
- 	VisualBoyAdvance.cfg	\
  	expr.l			\
  	expr.y			\
--- 161,168 ----
  DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)

+ dist_sysconf_DATA = VisualBoyAdvance.cfg
+ 
  EXTRA_DIST = \
  	win32			\
  	expr.l			\
  	expr.y			\
***************
*** 174,177 ****
--- 175,180 ----
  CONFIG_CLEAN_FILES =
  DIST_SOURCES =
+ DATA = $(dist_sysconf_DATA)
+ 

  RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
***************
*** 180,184 ****
  	installdirs-recursive install-recursive uninstall-recursive \
  	check-recursive installcheck-recursive
! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
  all: all-recursive

--- 183,187 ----
  	installdirs-recursive install-recursive uninstall-recursive \
  	check-recursive installcheck-recursive
! DIST_COMMON = $(dist_sysconf_DATA) $(srcdir)/Makefile.in Makefile.am
  all: all-recursive

***************
*** 190,193 ****
--- 193,214 ----
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
+ dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
+ install-dist_sysconfDATA: $(dist_sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+ 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	  echo " $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
+ 	  $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
+ 	done
+ 
+ uninstall-dist_sysconfDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	  echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \
+ 	  rm -f $(DESTDIR)$(sysconfdir)/$$f; \
+ 	done

  # This directory's subdirectories are mostly independent; you can cd
***************
*** 364,370 ****
  check-am: all-am
  check: check-recursive
! all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:

  install: install-recursive
--- 385,392 ----
  check-am: all-am
  check: check-recursive
! all-am: Makefile $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

  install: install-recursive
***************
*** 410,414 ****
  install-data-am:

! install-exec-am:

  install-info: install-info-recursive
--- 432,436 ----
  install-data-am:

! install-exec-am: install-dist_sysconfDATA

  install-info: install-info-recursive
***************
*** 434,438 ****
  ps-am:

! uninstall-am: uninstall-info-am

  uninstall-info: uninstall-info-recursive
--- 456,460 ----
  ps-am:

! uninstall-am: uninstall-dist_sysconfDATA uninstall-info-am

  uninstall-info: uninstall-info-recursive
***************
*** 443,454 ****
  	dvi dvi-am dvi-recursive info info-am info-recursive install \
  	install-am install-data install-data-am install-data-recursive \
! 	install-exec install-exec-am install-exec-recursive \
! 	install-info install-info-am install-info-recursive install-man \
! 	install-recursive install-strip installcheck installcheck-am \
! 	installdirs installdirs-am installdirs-recursive \
! 	maintainer-clean maintainer-clean-generic \
! 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
! 	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
! 	ps-recursive tags tags-recursive uninstall uninstall-am \
  	uninstall-info-am uninstall-info-recursive uninstall-recursive

--- 465,477 ----
  	dvi dvi-am dvi-recursive info info-am info-recursive install \
  	install-am install-data install-data-am install-data-recursive \
! 	install-dist_sysconfDATA install-exec install-exec-am \
! 	install-exec-recursive install-info install-info-am \
! 	install-info-recursive install-man install-recursive \
! 	install-strip installcheck installcheck-am installdirs \
! 	installdirs-am installdirs-recursive maintainer-clean \
! 	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
! 	mostlyclean-generic mostlyclean-recursive pdf pdf-am \
! 	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
! 	uninstall uninstall-am uninstall-dist_sysconfDATA \
  	uninstall-info-am uninstall-info-recursive uninstall-recursive

Index: remote.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/remote.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** remote.cpp	13 May 2004 22:35:36 -0000	1.7
--- remote.cpp	20 May 2004 21:01:29 -0000	1.8
***************
*** 21,44 ****
  #include <string.h>

! #ifdef __GNUC__
! #include <unistd.h>
! #include <sys/socket.h>
! #include <netdb.h>
! #ifdef HAVE_NETINET_IN_H
! #include <netinet/in.h>
! #endif
! #ifdef HAVE_ARPA_INET_H
! #include <arpa/inet.h>
! #else
! #define socklen_t int
! #endif
! #else
! #include <winsock.h>
! #include <io.h>
! #define socklen_t int
! #define close closesocket
! #define read _read
! #define write _write
! #endif // __GNUC__

  #include "GBA.h"
--- 21,44 ----
  #include <string.h>

! #ifndef WIN32
! # include <unistd.h>
! # include <sys/socket.h>
! # include <netdb.h>
! # ifdef HAVE_NETINET_IN_H
! #  include <netinet/in.h>
! # endif // HAVE_NETINET_IN_H
! # ifdef HAVE_ARPA_INET_H
! #  include <arpa/inet.h>
! # else // ! HAVE_ARPA_INET_H
! #  define socklen_t int
! # endif // ! HAVE_ARPA_INET_H
! #else // WIN32
! # include <winsock.h>
! # include <io.h>
! # define socklen_t int
! # define close closesocket
! # define read _read
! # define write _write
! #endif // WIN32

  #include "GBA.h"
***************
*** 86,94 ****
  {
    if(remoteSocket == -1) {
! #ifndef __GNUC__
      WSADATA wsaData;
-     
      int error = WSAStartup(MAKEWORD(1,1),&wsaData);
! #endif
      int s = socket(PF_INET, SOCK_STREAM, 0);

--- 86,93 ----
  {
    if(remoteSocket == -1) {
! #ifdef WIN32
      WSADATA wsaData;
      int error = WSAStartup(MAKEWORD(1,1),&wsaData);
! #endif // WIN32
      int s = socket(PF_INET, SOCK_STREAM, 0);

***************
*** 133,140 ****
      socklen_t len = sizeof(addr);

! #ifndef __GNUC__
      int flag = 0;    
      ioctlsocket(s, FIONBIO, (unsigned long *)&flag);
! #endif    
      int s2 = accept(s, (sockaddr *)&addr, &len);
      if(s2 > 0) {
--- 132,139 ----
      socklen_t len = sizeof(addr);

! #ifdef WIN32
      int flag = 0;    
      ioctlsocket(s, FIONBIO, (unsigned long *)&flag);
! #endif // WIN32
      int s2 = accept(s, (sockaddr *)&addr, &len);
      if(s2 > 0) {
***************
*** 143,149 ****
                ntohs(addr.sin_port));
      } else {
! #ifndef __GNUC__
        int error = WSAGetLastError();
! #endif
      }
      char dummy;
--- 142,148 ----
                ntohs(addr.sin_port));
      } else {
! #ifdef WIN32
        int error = WSAGetLastError();
! #endif // WIN32
      }
      char dummy;

Index: Makefile.am
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.am	12 May 2004 01:07:05 -0000	1.17
--- Makefile.am	20 May 2004 21:01:28 -0000	1.18
***************
*** 7,13 ****
  DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)

  EXTRA_DIST = \
  	win32			\
- 	VisualBoyAdvance.cfg	\
  	expr.l			\
  	expr.y			\
--- 7,14 ----
  DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)

+ dist_sysconf_DATA = VisualBoyAdvance.cfg
+ 
  EXTRA_DIST = \
  	win32			\
  	expr.l			\
  	expr.y			\

Index: Util.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Util.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Util.cpp	13 May 2004 15:06:44 -0000	1.22
--- Util.cpp	20 May 2004 21:01:29 -0000	1.23
***************
*** 44,50 ****
  }

! #ifdef __GNUC__
  #define _stricmp strcasecmp
! #endif

  static int (*utilGzWriteFunc)(gzFile, const voidp, unsigned int) = NULL;
--- 44,50 ----
  }

! #ifndef _MSC_VER
  #define _stricmp strcasecmp
! #endif // ! _MSC_VER

  static int (*utilGzWriteFunc)(gzFile, const voidp, unsigned int) = NULL;

Thread: [vba-commit] VisualBoyAdvance/src Makefile.am,1.17,1.18 Makefile.in,1.20,1.21 Util.cpp,1.22,1.23 rem

An emulator for Gameboy and GameboyAdvance systems

vba-commit