diff --git a/makefile.pi b/makefile.pi index 8d1518437..9dbd320ca 100644 --- a/makefile.pi +++ b/makefile.pi @@ -71,7 +71,7 @@ depobj += neocdlist.o \ ifdef INCLUDE_7Z_SUPPORT depobj += un7z.o 7zArcIn.o 7zBuf.o 7zBuf2.o 7zCrc.o 7zCrcOpt.o \ 7zDec.o 7zFile.o 7zStream.o Bcj2.o Bra.o Bra86.o BraIA64.o \ - CpuArch.o Delta.o LzmaDec.o Lzma2Dec.o Ppmd7.o Ppmd7Dec.o + CpuArch.o Delta.o LzmaDec.o Lzma2Dec.o Ppmd7.o Ppmd7Dec.o \ Sha256.o Xz.o XzCrc64.o XzCrc64Opt.o XzDec.o endif @@ -551,7 +551,7 @@ touch: clean: @echo Removing build files... - -@rm -fr $(objdir) $(ctv.h) $(dep)generated $(NAME) + -@rm -fr $(objdir) $(ctv.h) $(dep)generated gamelist.txt $(NAME) ifdef PERL @echo Removing all files generated with perl scripts... diff --git a/makefile.sdl b/makefile.sdl index 34bc3b06c..15935c914 100644 --- a/makefile.sdl +++ b/makefile.sdl @@ -559,7 +559,7 @@ touch: clean: @echo Removing build files... - -@rm -fr $(objdir) $(ctv.h) $(dep)generated $(NAME) + -@rm -fr $(objdir) $(ctv.h) $(dep)generated gamelist.txt $(NAME) ifdef PERL @echo Removing all files generated with perl scripts... diff --git a/src/burn/burn.cpp b/src/burn/burn.cpp index bf01768a7..78bb3d216 100644 --- a/src/burn/burn.cpp +++ b/src/burn/burn.cpp @@ -925,14 +925,15 @@ struct MovieExtInfo UINT32 hour, minute, second; }; -#ifndef BUILD_PI +#ifndef BUILD_SDL extern struct MovieExtInfo MovieInfo; // from replay.cpp +#else +struct MovieExtInfo MovieInfo = { 0, 0, 0, 0, 0, 0 }; #endif void BurnGetLocalTime(tm *nTime) { if (is_netgame_or_recording()) { -#ifndef BUILD_SDL if (is_netgame_or_recording() & 2) { // recording/playback nTime->tm_sec = MovieInfo.second; nTime->tm_min = MovieInfo.minute; @@ -941,7 +942,6 @@ void BurnGetLocalTime(tm *nTime) nTime->tm_mon = MovieInfo.month; nTime->tm_year = MovieInfo.year; } else { -#endif nTime->tm_sec = 0; // defaults for netgame nTime->tm_min = 0; nTime->tm_hour = 0; @@ -949,9 +949,7 @@ void BurnGetLocalTime(tm *nTime) nTime->tm_wday = 3; nTime->tm_mon = 6 - 1; nTime->tm_year = 2018; -#ifndef BUILD_SDL } -#endif } else { time_t nLocalTime = time(NULL); // query current time from this machine tm* tmLocalTime = localtime(&nLocalTime); diff --git a/src/burn/drv/atari/WHATSNEW.txt.cpp b/src/burn/drv/atari/WHATSNEW.txt similarity index 100% rename from src/burn/drv/atari/WHATSNEW.txt.cpp rename to src/burn/drv/atari/WHATSNEW.txt diff --git a/src/burner/pi/main_pi.cpp b/src/burner/pi/main_pi.cpp index 85093953f..5769699ac 100644 --- a/src/burner/pi/main_pi.cpp +++ b/src/burner/pi/main_pi.cpp @@ -1,5 +1,4 @@ #include "burner.h" -#include "config.h" #include #include