diff --git a/.gitignore b/.gitignore index 674deb69..66c6c7fc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,7 @@ .*.swp .DS_store # Simulated Subversion default ignores end here +# The contents of the svn:ignore property on the branch root. +/.sconsign.dblite +/config.log +/.sconf_temp diff --git a/AUTHORS b/AUTHORS index dac58c31..6ef196f8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -54,7 +54,8 @@ Build system Soules - gimmedonutnow at gmail dot com Linux SDL driver maintenance -Radsaq - document thyself +radsaq - radsaq at gmail dot com +Build system, testing, and random cleanups ----------------------------------------- Included components: diff --git a/src/.gitignore b/src/.gitignore index 674deb69..7061d616 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,17 +1 @@ -# A simulation of Subversion default ignores, generated by reposurgeon. -*.o -*.lo -*.la -*.al -*.libs -*.so -*.so.[0-9]* -*.a -*.pyc -*.pyo -*.rej -*~ -*.#* -.*.swp -.DS_store -# Simulated Subversion default ignores end here +/fceu diff --git a/src/drivers/sdl/Makefile.am.inc b/src/drivers/sdl/Makefile.am.inc deleted file mode 100644 index dee23586..00000000 --- a/src/drivers/sdl/Makefile.am.inc +++ /dev/null @@ -1,7 +0,0 @@ -fceud_SOURCES = drivers/pc/input.cpp drivers/pc/main.cpp drivers/pc/sdl.cpp drivers/pc/sdl-joystick.cpp drivers/pc/sdl-sound.cpp drivers/pc/sdl-throttle.cpp drivers/pc/sdl-video.cpp drivers/pc/unix-netplay.cpp - -if OPENGL -TMP_OGL = drivers/pc/sdl-opengl.cpp -endif - -fceud_SOURCES += $(TMP_OGL)