diff --git a/configure b/configure index c571fe945..d8fdd4ecf 100755 --- a/configure +++ b/configure @@ -345,9 +345,6 @@ arm-riscos-aof) psp) EXEEXT=".elf" ;; -gp2x) - EXEEXT="" - ;; *) EXEEXT="" ;; @@ -796,6 +793,8 @@ echo find_sdlconfig SRC="src" +SRC_OS="$SRC/os" +SRC_LIB="$SRC/lib" CORE="$SRC/emucore" COMMON="$SRC/common" TIA="$SRC/emucore/tia" @@ -804,16 +803,16 @@ TV="$SRC/common/tv_filters" GUI="$SRC/gui" DBG="$SRC/debugger" DBGGUI="$SRC/debugger/gui" -YACC="$SRC/yacc" +YACC="$SRC/debugger/yacc" CHEAT="$SRC/cheat" -LIBPNG="$SRC/libpng" -LIBJPG="$SRC/nanojpeg" -LIBJPGEXIF="$SRC/tinyexif" -ZLIB="$SRC/zlib" +LIBPNG="$SRC_LIB/libpng" +LIBJPG="$SRC_LIB/nanojpeg" +LIBJPGEXIF="$SRC_LIB/tinyexif" +ZLIB="$SRC_LIB/zlib" SQLITE_REPO="$SRC/common/repository/sqlite" -SQLITE_LIB="$SRC/sqlite" -JSON="$SRC/json" -HTTP_LIB="$SRC/httplib" +SQLITE_LIB="$SRC_LIB/sqlite" +JSON="$SRC_LIB/json" +HTTP_LIB="$SRC_LIB/httplib" INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER -I$JSON -I$SQLITE_REPO" @@ -831,26 +830,26 @@ LD=$CXX case $_host_os in unix) DEFINES="$DEFINES -DBSPF_UNIX" - MODULES="$MODULES $SRC/unix" - INCLUDES="$INCLUDES -I$SRC/unix" + MODULES="$MODULES $SRC_OS/unix" + INCLUDES="$INCLUDES -I$SRC_OS/unix" ;; darwin) DEFINES="$DEFINES -DBSPF_UNIX -DMACOS_KEYS" - MODULES="$MODULES $SRC/unix" - INCLUDES="$INCLUDES -I$SRC/unix" + MODULES="$MODULES $SRC_OS/unix" + INCLUDES="$INCLUDES -I$SRC_OS/unix" if test "$have_clang" == yes; then CXXFLAGS="$CXXFLAGS -Wno-poison-system-directories" fi ;; retron77) DEFINES="$DEFINES -DBSPF_UNIX -DRETRON77" - MODULES="$MODULES $SRC/unix $SRC/unix/r77" - INCLUDES="$INCLUDES -I$SRC/unix -I$SRC/unix/r77" + MODULES="$MODULES $SRC_OS/unix $SRC_OS/unix/r77" + INCLUDES="$INCLUDES -I$SRC_OS/unix -I$SRC_OS/unix/r77" ;; win32) DEFINES="$DEFINES -DBSPF_WINDOWS" - MODULES="$MODULES $SRC/windows" - INCLUDES="$INCLUDES -I$SRC/windows" + MODULES="$MODULES $SRC_OS/windows" + INCLUDES="$INCLUDES -I$SRC_OS/windows" LIBS="$LIBS -lmingw32 -lwinmm" ;; *) diff --git a/src/common/JPGLibrary.cxx b/src/common/JPGLibrary.cxx index c5cc3ace4..66f81a360 100644 --- a/src/common/JPGLibrary.cxx +++ b/src/common/JPGLibrary.cxx @@ -111,7 +111,7 @@ void JPGLibrary::readMetaData(const string& filename, VariantList& metaData) std::ifstream in(filename, std::ifstream::binary); // parse image EXIF metadata - TinyEXIF::EXIFInfo imageEXIF(in); + const TinyEXIF::EXIFInfo imageEXIF(in); if(imageEXIF.Fields) { // For now we only read the image description diff --git a/src/common/ZipHandler.cxx b/src/common/ZipHandler.cxx index e4e568691..6105e710f 100644 --- a/src/common/ZipHandler.cxx +++ b/src/common/ZipHandler.cxx @@ -273,7 +273,6 @@ void ZipHandler::ZipFile::close() void ZipHandler::ZipFile::readEcd() { uInt64 buflen = 1024; - ByteBuffer buffer; // We may need multiple tries while(buflen < 65536) @@ -285,7 +284,7 @@ void ZipHandler::ZipFile::readEcd() buflen = myLength; // Allocate buffer - buffer = make_unique(buflen + 1); + ByteBuffer buffer = make_unique(buflen + 1); if(buffer == nullptr) throw runtime_error(errorMessage(ZipError::OUT_OF_MEMORY)); diff --git a/src/yacc/Makefile.yacc b/src/debugger/yacc/Makefile.yacc similarity index 100% rename from src/yacc/Makefile.yacc rename to src/debugger/yacc/Makefile.yacc diff --git a/src/yacc/README.txt b/src/debugger/yacc/README.txt similarity index 100% rename from src/yacc/README.txt rename to src/debugger/yacc/README.txt diff --git a/src/yacc/YaccParser.cxx b/src/debugger/yacc/YaccParser.cxx similarity index 100% rename from src/yacc/YaccParser.cxx rename to src/debugger/yacc/YaccParser.cxx diff --git a/src/yacc/YaccParser.hxx b/src/debugger/yacc/YaccParser.hxx similarity index 96% rename from src/yacc/YaccParser.hxx rename to src/debugger/yacc/YaccParser.hxx index c8d3e08fd..9940b6aaa 100644 --- a/src/yacc/YaccParser.hxx +++ b/src/debugger/yacc/YaccParser.hxx @@ -15,8 +15,8 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#ifndef PARSER_HXX -#define PARSER_HXX +#ifndef YACC_PARSER_HXX +#define YACC_PARSER_HXX #include "Expression.hxx" #include "CartDebug.hxx" diff --git a/src/yacc/calctest.c b/src/debugger/yacc/calctest.c similarity index 100% rename from src/yacc/calctest.c rename to src/debugger/yacc/calctest.c diff --git a/src/unix/module.mk b/src/debugger/yacc/module.mk similarity index 52% rename from src/unix/module.mk rename to src/debugger/yacc/module.mk index 5e791a65c..9f51bb344 100644 --- a/src/unix/module.mk +++ b/src/debugger/yacc/module.mk @@ -1,11 +1,10 @@ -MODULE := src/unix +MODULE := src/debugger/yacc MODULE_OBJS := \ - src/unix/OSystemUNIX.o \ - src/unix/SerialPortUNIX.o + src/debugger/yacc/YaccParser.o MODULE_DIRS += \ - src/unix + src/debugger/yacc # Include common rules include $(srcdir)/common.rules diff --git a/src/yacc/stella.y b/src/debugger/yacc/stella.y similarity index 100% rename from src/yacc/stella.y rename to src/debugger/yacc/stella.y diff --git a/src/yacc/y.tab.c b/src/debugger/yacc/y.tab.c similarity index 100% rename from src/yacc/y.tab.c rename to src/debugger/yacc/y.tab.c diff --git a/src/yacc/y.tab.h b/src/debugger/yacc/y.tab.h similarity index 100% rename from src/yacc/y.tab.h rename to src/debugger/yacc/y.tab.h diff --git a/src/emucore/DefProps.hxx b/src/emucore/DefProps.hxx index fac824d9f..b669dcf48 100644 --- a/src/emucore/DefProps.hxx +++ b/src/emucore/DefProps.hxx @@ -1979,7 +1979,7 @@ static constexpr BSPF::array2D DefProps = {{ { "87662815bc4f3c3c86071dc994e3f30e", "Intellivision Productions - M Network, Patricia Lewis Du Long, Stephen Tatsumi", "", "Swordfight (1983) (Intellivision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "876a953daae0e946620cf05ed41989f4", "Retroactive", "", "Qb (V2.08) (PAL) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "877a5397f3f205bf6750398c98f33de1", "Erik Eid", "", "Euchre (Beta) (PAL) (12-09-2002) (Erik Eid)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "8786c1e56ef221d946c64f6b65b697e9", "20th Century Fox Video Games, David Lubar", "11015", "AKA Space Adventure", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "8786c1e56ef221d946c64f6b65b697e9", "20th Century Fox Video Games - Sirius Software, David Lubar", "11015", "Flash Gordon (1983) (20th Century Fox Video Games - Sirius Software, David Lubar)", "AKA Space Adventure", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "8786f229b974c393222874f73a9f3206", "Activision, Larry Miller - Ariola", "EAX-021, EAX-021-04I - 711 021-720", "Spider Fighter (1983) (Activision) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "8786f4609a66fbea2cd9aa48ca7aa11c", "Goliath", "5", "Open Sesame (1983) (Goliath) (PAL)", "AKA Open, Sesame!", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "87b460df21b7bbcfc57b1c082c6794b0", "Dennis Debro", "", "Climber 5 (20-03-2003) (Dennis Debro)", "", "Homebrew", "", "", "", "", "https://atariage.com/store/index.php?l=product_detail&p=261", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, diff --git a/src/emucore/stella.pro b/src/emucore/stella.pro index cdf4f08ea..f40ee4a16 100644 --- a/src/emucore/stella.pro +++ b/src/emucore/stella.pro @@ -12385,9 +12385,10 @@ "" "Cart.MD5" "8786c1e56ef221d946c64f6b65b697e9" -"Cart.Manufacturer" "20th Century Fox Video Games, David Lubar" +"Cart.Manufacturer" "20th Century Fox Video Games - Sirius Software, David Lubar" "Cart.ModelNo" "11015" -"Cart.Name" "AKA Space Adventure" +"Cart.Name" "Flash Gordon (1983) (20th Century Fox Video Games - Sirius Software, David Lubar)" +"Cart.Note" "AKA Space Adventure" "" "Cart.MD5" "8786f229b974c393222874f73a9f3206" diff --git a/src/gui/RomImageWidget.cxx b/src/gui/RomImageWidget.cxx index d615cfea6..eb20aaeb4 100644 --- a/src/gui/RomImageWidget.cxx +++ b/src/gui/RomImageWidget.cxx @@ -48,6 +48,13 @@ void RomImageWidget::setProperties(const FSNode& node, const Properties properti // Decide whether the information should be shown immediately if(instance().eventHandler().state() == EventHandlerState::LAUNCHER) parseProperties(node, full); + else + { +#ifdef DEBUGGER_SUPPORT + cerr << "RomImageWidget::setProperties: else!" << endl; + Logger::debug("RomImageWidget::setProperties: else!"); +#endif + } } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -60,6 +67,13 @@ void RomImageWidget::clearProperties() // Decide whether the information should be shown immediately if(instance().eventHandler().state() == EventHandlerState::LAUNCHER) setDirty(); + else + { +#ifdef DEBUGGER_SUPPORT + cerr << "RomImageWidget::clearProperties: else!" << endl; + Logger::debug("RomImageWidget::clearProperties: else!"); +#endif + } } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -136,7 +150,7 @@ void RomImageWidget::parseProperties(const FSNode& node, bool full) } else { - const string& oldFileName = myImageList.size() ? myImageList[0].getPath() : EmptyString; + const string oldFileName = myImageList.size() ? myImageList[0].getPath() : EmptyString; // Try to find all snapshots by property and ROM file name myImageList.clear(); @@ -146,6 +160,8 @@ void RomImageWidget::parseProperties(const FSNode& node, bool full) // property *and* ROM name are found (TODO: fix that!) if(myImageList.size() && myImageList[0].getPath() != oldFileName) loadImage(myImageList[0].getPath()); + else + setDirty(); // update the counter display } #else mySurfaceIsValid = false; diff --git a/src/httplib/LICENSE b/src/lib/httplib/LICENSE similarity index 100% rename from src/httplib/LICENSE rename to src/lib/httplib/LICENSE diff --git a/src/httplib/README.md b/src/lib/httplib/README.md similarity index 100% rename from src/httplib/README.md rename to src/lib/httplib/README.md diff --git a/src/httplib/http_lib.hxx b/src/lib/httplib/http_lib.hxx similarity index 100% rename from src/httplib/http_lib.hxx rename to src/lib/httplib/http_lib.hxx diff --git a/src/httplib/httplib.h b/src/lib/httplib/httplib.h similarity index 100% rename from src/httplib/httplib.h rename to src/lib/httplib/httplib.h diff --git a/src/json/LICENSE.MIT b/src/lib/json/LICENSE.MIT similarity index 100% rename from src/json/LICENSE.MIT rename to src/lib/json/LICENSE.MIT diff --git a/src/json/README.md b/src/lib/json/README.md similarity index 100% rename from src/json/README.md rename to src/lib/json/README.md diff --git a/src/json/json.hxx b/src/lib/json/json.hxx similarity index 100% rename from src/json/json.hxx rename to src/lib/json/json.hxx diff --git a/src/json/json_lib.hxx b/src/lib/json/json_lib.hxx similarity index 100% rename from src/json/json_lib.hxx rename to src/lib/json/json_lib.hxx diff --git a/src/lib/libpng/module.mk b/src/lib/libpng/module.mk new file mode 100644 index 000000000..d450711b5 --- /dev/null +++ b/src/lib/libpng/module.mk @@ -0,0 +1,24 @@ +MODULE := src/lib/libpng + +MODULE_OBJS := \ + src/lib/libpng/png.o \ + src/lib/libpng/pngerror.o \ + src/lib/libpng/pngget.o \ + src/lib/libpng/pngmem.o \ + src/lib/libpng/pngpread.o \ + src/lib/libpng/pngread.o \ + src/lib/libpng/pngrio.o \ + src/lib/libpng/pngrtran.o \ + src/lib/libpng/pngrutil.o \ + src/lib/libpng/pngset.o \ + src/lib/libpng/pngtrans.o \ + src/lib/libpng/pngwio.o \ + src/lib/libpng/pngwrite.o \ + src/lib/libpng/pngwtran.o \ + src/lib/libpng/pngwutil.o + +MODULE_DIRS += \ + src/lib/libpng + +# Include common rules +include $(srcdir)/common.rules diff --git a/src/libpng/png.c b/src/lib/libpng/png.c similarity index 100% rename from src/libpng/png.c rename to src/lib/libpng/png.c diff --git a/src/libpng/png.h b/src/lib/libpng/png.h similarity index 100% rename from src/libpng/png.h rename to src/lib/libpng/png.h diff --git a/src/libpng/pngconf.h b/src/lib/libpng/pngconf.h similarity index 100% rename from src/libpng/pngconf.h rename to src/lib/libpng/pngconf.h diff --git a/src/libpng/pngdebug.h b/src/lib/libpng/pngdebug.h similarity index 100% rename from src/libpng/pngdebug.h rename to src/lib/libpng/pngdebug.h diff --git a/src/libpng/pngerror.c b/src/lib/libpng/pngerror.c similarity index 100% rename from src/libpng/pngerror.c rename to src/lib/libpng/pngerror.c diff --git a/src/libpng/pngget.c b/src/lib/libpng/pngget.c similarity index 100% rename from src/libpng/pngget.c rename to src/lib/libpng/pngget.c diff --git a/src/libpng/pnginfo.h b/src/lib/libpng/pnginfo.h similarity index 100% rename from src/libpng/pnginfo.h rename to src/lib/libpng/pnginfo.h diff --git a/src/libpng/pnglibconf.h b/src/lib/libpng/pnglibconf.h similarity index 100% rename from src/libpng/pnglibconf.h rename to src/lib/libpng/pnglibconf.h diff --git a/src/libpng/pngmem.c b/src/lib/libpng/pngmem.c similarity index 100% rename from src/libpng/pngmem.c rename to src/lib/libpng/pngmem.c diff --git a/src/libpng/pngpread.c b/src/lib/libpng/pngpread.c similarity index 100% rename from src/libpng/pngpread.c rename to src/lib/libpng/pngpread.c diff --git a/src/libpng/pngpriv.h b/src/lib/libpng/pngpriv.h similarity index 100% rename from src/libpng/pngpriv.h rename to src/lib/libpng/pngpriv.h diff --git a/src/libpng/pngread.c b/src/lib/libpng/pngread.c similarity index 100% rename from src/libpng/pngread.c rename to src/lib/libpng/pngread.c diff --git a/src/libpng/pngrio.c b/src/lib/libpng/pngrio.c similarity index 100% rename from src/libpng/pngrio.c rename to src/lib/libpng/pngrio.c diff --git a/src/libpng/pngrtran.c b/src/lib/libpng/pngrtran.c similarity index 100% rename from src/libpng/pngrtran.c rename to src/lib/libpng/pngrtran.c diff --git a/src/libpng/pngrutil.c b/src/lib/libpng/pngrutil.c similarity index 100% rename from src/libpng/pngrutil.c rename to src/lib/libpng/pngrutil.c diff --git a/src/libpng/pngset.c b/src/lib/libpng/pngset.c similarity index 100% rename from src/libpng/pngset.c rename to src/lib/libpng/pngset.c diff --git a/src/libpng/pngstruct.h b/src/lib/libpng/pngstruct.h similarity index 100% rename from src/libpng/pngstruct.h rename to src/lib/libpng/pngstruct.h diff --git a/src/libpng/pngtrans.c b/src/lib/libpng/pngtrans.c similarity index 100% rename from src/libpng/pngtrans.c rename to src/lib/libpng/pngtrans.c diff --git a/src/libpng/pngwio.c b/src/lib/libpng/pngwio.c similarity index 100% rename from src/libpng/pngwio.c rename to src/lib/libpng/pngwio.c diff --git a/src/libpng/pngwrite.c b/src/lib/libpng/pngwrite.c similarity index 100% rename from src/libpng/pngwrite.c rename to src/lib/libpng/pngwrite.c diff --git a/src/libpng/pngwtran.c b/src/lib/libpng/pngwtran.c similarity index 100% rename from src/libpng/pngwtran.c rename to src/lib/libpng/pngwtran.c diff --git a/src/libpng/pngwutil.c b/src/lib/libpng/pngwutil.c similarity index 100% rename from src/libpng/pngwutil.c rename to src/lib/libpng/pngwutil.c diff --git a/src/nanojpeg/nanojpeg.c b/src/lib/nanojpeg/nanojpeg.c similarity index 100% rename from src/nanojpeg/nanojpeg.c rename to src/lib/nanojpeg/nanojpeg.c diff --git a/src/nanojpeg/nanojpeg_lib.hxx b/src/lib/nanojpeg/nanojpeg_lib.hxx similarity index 100% rename from src/nanojpeg/nanojpeg_lib.hxx rename to src/lib/nanojpeg/nanojpeg_lib.hxx diff --git a/src/sqlite/module.mk b/src/lib/sqlite/module.mk similarity index 57% rename from src/sqlite/module.mk rename to src/lib/sqlite/module.mk index 829748fc5..bfb143ca9 100644 --- a/src/sqlite/module.mk +++ b/src/lib/sqlite/module.mk @@ -1,10 +1,10 @@ -MODULE := src/sqlite +MODULE := src/lib/sqlite MODULE_OBJS := \ - src/sqlite/sqlite3.o + src/lib/sqlite/sqlite3.o MODULE_DIRS += \ - src/sqlite + src/lib/sqlite # Include common rules include $(srcdir)/common.rules diff --git a/src/sqlite/source/sqlite3.c b/src/lib/sqlite/source/sqlite3.c similarity index 100% rename from src/sqlite/source/sqlite3.c rename to src/lib/sqlite/source/sqlite3.c diff --git a/src/sqlite/source/sqlite3.h b/src/lib/sqlite/source/sqlite3.h similarity index 100% rename from src/sqlite/source/sqlite3.h rename to src/lib/sqlite/source/sqlite3.h diff --git a/src/sqlite/sqlite3.c b/src/lib/sqlite/sqlite3.c similarity index 100% rename from src/sqlite/sqlite3.c rename to src/lib/sqlite/sqlite3.c diff --git a/src/sqlite/sqlite3.h b/src/lib/sqlite/sqlite3.h similarity index 100% rename from src/sqlite/sqlite3.h rename to src/lib/sqlite/sqlite3.h diff --git a/src/sqlite/sqlite_options.h b/src/lib/sqlite/sqlite_options.h similarity index 100% rename from src/sqlite/sqlite_options.h rename to src/lib/sqlite/sqlite_options.h diff --git a/src/tinyexif/module.mk b/src/lib/tinyexif/module.mk similarity index 55% rename from src/tinyexif/module.mk rename to src/lib/tinyexif/module.mk index 882915a66..1d59efe84 100644 --- a/src/tinyexif/module.mk +++ b/src/lib/tinyexif/module.mk @@ -1,10 +1,10 @@ -MODULE := src/tinyexif +MODULE := src/lib/tinyexif MODULE_OBJS := \ - src/tinyexif/tinyexif.o + src/lib/tinyexif/tinyexif.o MODULE_DIRS += \ - src/tinyexif + src/lib/tinyexif # Include common rules include $(srcdir)/common.rules diff --git a/src/tinyexif/source/README.md b/src/lib/tinyexif/source/README.md similarity index 100% rename from src/tinyexif/source/README.md rename to src/lib/tinyexif/source/README.md diff --git a/src/tinyexif/source/TinyEXIF.cpp b/src/lib/tinyexif/source/TinyEXIF.cpp similarity index 100% rename from src/tinyexif/source/TinyEXIF.cpp rename to src/lib/tinyexif/source/TinyEXIF.cpp diff --git a/src/tinyexif/source/TinyEXIF.h b/src/lib/tinyexif/source/TinyEXIF.h similarity index 100% rename from src/tinyexif/source/TinyEXIF.h rename to src/lib/tinyexif/source/TinyEXIF.h diff --git a/src/tinyexif/tinyexif.cxx b/src/lib/tinyexif/tinyexif.cxx similarity index 100% rename from src/tinyexif/tinyexif.cxx rename to src/lib/tinyexif/tinyexif.cxx diff --git a/src/tinyexif/tinyexif_lib.hxx b/src/lib/tinyexif/tinyexif_lib.hxx similarity index 100% rename from src/tinyexif/tinyexif_lib.hxx rename to src/lib/tinyexif/tinyexif_lib.hxx diff --git a/src/zlib/README b/src/lib/zlib/README similarity index 100% rename from src/zlib/README rename to src/lib/zlib/README diff --git a/src/zlib/adler32.c b/src/lib/zlib/adler32.c similarity index 100% rename from src/zlib/adler32.c rename to src/lib/zlib/adler32.c diff --git a/src/zlib/compress.c b/src/lib/zlib/compress.c similarity index 100% rename from src/zlib/compress.c rename to src/lib/zlib/compress.c diff --git a/src/zlib/crc32.c b/src/lib/zlib/crc32.c similarity index 100% rename from src/zlib/crc32.c rename to src/lib/zlib/crc32.c diff --git a/src/zlib/crc32.h b/src/lib/zlib/crc32.h similarity index 100% rename from src/zlib/crc32.h rename to src/lib/zlib/crc32.h diff --git a/src/zlib/deflate.c b/src/lib/zlib/deflate.c similarity index 100% rename from src/zlib/deflate.c rename to src/lib/zlib/deflate.c diff --git a/src/zlib/deflate.h b/src/lib/zlib/deflate.h similarity index 100% rename from src/zlib/deflate.h rename to src/lib/zlib/deflate.h diff --git a/src/zlib/gzclose.c b/src/lib/zlib/gzclose.c similarity index 100% rename from src/zlib/gzclose.c rename to src/lib/zlib/gzclose.c diff --git a/src/zlib/gzguts.h b/src/lib/zlib/gzguts.h similarity index 100% rename from src/zlib/gzguts.h rename to src/lib/zlib/gzguts.h diff --git a/src/zlib/gzlib.c b/src/lib/zlib/gzlib.c similarity index 100% rename from src/zlib/gzlib.c rename to src/lib/zlib/gzlib.c diff --git a/src/zlib/gzread.c b/src/lib/zlib/gzread.c similarity index 100% rename from src/zlib/gzread.c rename to src/lib/zlib/gzread.c diff --git a/src/zlib/gzwrite.c b/src/lib/zlib/gzwrite.c similarity index 100% rename from src/zlib/gzwrite.c rename to src/lib/zlib/gzwrite.c diff --git a/src/zlib/infback.c b/src/lib/zlib/infback.c similarity index 100% rename from src/zlib/infback.c rename to src/lib/zlib/infback.c diff --git a/src/zlib/inffast.c b/src/lib/zlib/inffast.c similarity index 100% rename from src/zlib/inffast.c rename to src/lib/zlib/inffast.c diff --git a/src/zlib/inffast.h b/src/lib/zlib/inffast.h similarity index 100% rename from src/zlib/inffast.h rename to src/lib/zlib/inffast.h diff --git a/src/zlib/inffixed.h b/src/lib/zlib/inffixed.h similarity index 100% rename from src/zlib/inffixed.h rename to src/lib/zlib/inffixed.h diff --git a/src/zlib/inflate.c b/src/lib/zlib/inflate.c similarity index 100% rename from src/zlib/inflate.c rename to src/lib/zlib/inflate.c diff --git a/src/zlib/inflate.h b/src/lib/zlib/inflate.h similarity index 100% rename from src/zlib/inflate.h rename to src/lib/zlib/inflate.h diff --git a/src/zlib/inftrees.c b/src/lib/zlib/inftrees.c similarity index 100% rename from src/zlib/inftrees.c rename to src/lib/zlib/inftrees.c diff --git a/src/zlib/inftrees.h b/src/lib/zlib/inftrees.h similarity index 100% rename from src/zlib/inftrees.h rename to src/lib/zlib/inftrees.h diff --git a/src/lib/zlib/module.mk b/src/lib/zlib/module.mk new file mode 100644 index 000000000..f536747ab --- /dev/null +++ b/src/lib/zlib/module.mk @@ -0,0 +1,24 @@ +MODULE := src/lib/zlib + +MODULE_OBJS := \ + src/lib/zlib/adler32.o \ + src/lib/zlib/compress.o \ + src/lib/zlib/crc32.o \ + src/lib/zlib/gzclose.o \ + src/lib/zlib/gzlib.o \ + src/lib/zlib/gzread.o \ + src/lib/zlib/gzwrite.o \ + src/lib/zlib/uncompr.o \ + src/lib/zlib/deflate.o \ + src/lib/zlib/trees.o \ + src/lib/zlib/zutil.o \ + src/lib/zlib/inflate.o \ + src/lib/zlib/infback.o \ + src/lib/zlib/inftrees.o \ + src/lib/zlib/inffast.o + +MODULE_DIRS += \ + src/lib/zlib + +# Include common rules +include $(srcdir)/common.rules diff --git a/src/zlib/trees.c b/src/lib/zlib/trees.c similarity index 100% rename from src/zlib/trees.c rename to src/lib/zlib/trees.c diff --git a/src/zlib/trees.h b/src/lib/zlib/trees.h similarity index 100% rename from src/zlib/trees.h rename to src/lib/zlib/trees.h diff --git a/src/zlib/uncompr.c b/src/lib/zlib/uncompr.c similarity index 100% rename from src/zlib/uncompr.c rename to src/lib/zlib/uncompr.c diff --git a/src/zlib/zconf.h b/src/lib/zlib/zconf.h similarity index 100% rename from src/zlib/zconf.h rename to src/lib/zlib/zconf.h diff --git a/src/zlib/zlib.h b/src/lib/zlib/zlib.h similarity index 100% rename from src/zlib/zlib.h rename to src/lib/zlib/zlib.h diff --git a/src/zlib/zutil.c b/src/lib/zlib/zutil.c similarity index 100% rename from src/zlib/zutil.c rename to src/lib/zlib/zutil.c diff --git a/src/zlib/zutil.h b/src/lib/zlib/zutil.h similarity index 100% rename from src/zlib/zutil.h rename to src/lib/zlib/zutil.h diff --git a/src/libpng/module.mk b/src/libpng/module.mk deleted file mode 100644 index 516cef851..000000000 --- a/src/libpng/module.mk +++ /dev/null @@ -1,24 +0,0 @@ -MODULE := src/libpng - -MODULE_OBJS := \ - src/libpng/png.o \ - src/libpng/pngerror.o \ - src/libpng/pngget.o \ - src/libpng/pngmem.o \ - src/libpng/pngpread.o \ - src/libpng/pngread.o \ - src/libpng/pngrio.o \ - src/libpng/pngrtran.o \ - src/libpng/pngrutil.o \ - src/libpng/pngset.o \ - src/libpng/pngtrans.o \ - src/libpng/pngwio.o \ - src/libpng/pngwrite.o \ - src/libpng/pngwtran.o \ - src/libpng/pngwutil.o - -MODULE_DIRS += \ - src/libpng - -# Include common rules -include $(srcdir)/common.rules diff --git a/src/libretro/EventHandlerLIBRETRO.hxx b/src/os/libretro/EventHandlerLIBRETRO.hxx similarity index 100% rename from src/libretro/EventHandlerLIBRETRO.hxx rename to src/os/libretro/EventHandlerLIBRETRO.hxx diff --git a/src/libretro/FBBackendLIBRETRO.hxx b/src/os/libretro/FBBackendLIBRETRO.hxx similarity index 100% rename from src/libretro/FBBackendLIBRETRO.hxx rename to src/os/libretro/FBBackendLIBRETRO.hxx diff --git a/src/libretro/FBSurfaceLIBRETRO.hxx b/src/os/libretro/FBSurfaceLIBRETRO.hxx similarity index 100% rename from src/libretro/FBSurfaceLIBRETRO.hxx rename to src/os/libretro/FBSurfaceLIBRETRO.hxx diff --git a/src/libretro/FSNodeLIBRETRO.cxx b/src/os/libretro/FSNodeLIBRETRO.cxx similarity index 100% rename from src/libretro/FSNodeLIBRETRO.cxx rename to src/os/libretro/FSNodeLIBRETRO.cxx diff --git a/src/libretro/FSNodeLIBRETRO.hxx b/src/os/libretro/FSNodeLIBRETRO.hxx similarity index 100% rename from src/libretro/FSNodeLIBRETRO.hxx rename to src/os/libretro/FSNodeLIBRETRO.hxx diff --git a/src/libretro/Makefile b/src/os/libretro/Makefile similarity index 99% rename from src/libretro/Makefile rename to src/os/libretro/Makefile index a17099234..d8695faef 100644 --- a/src/libretro/Makefile +++ b/src/os/libretro/Makefile @@ -538,7 +538,7 @@ else CXXFLAGS += -D__WIN32__ endif -CORE_DIR := .. +CORE_DIR := ../.. ifeq ($(DEBUG), 1) ifneq (,$(findstring msvc,$(platform))) @@ -580,7 +580,7 @@ else ifneq (,$(findstring msvc,$(platform))) CODE_DEFINES = else WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter - CODE_DEFINES = + CODE_DEFINES = endif CXXFLAGS += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic) diff --git a/src/libretro/Makefile.common b/src/os/libretro/Makefile.common similarity index 92% rename from src/libretro/Makefile.common rename to src/os/libretro/Makefile.common index 782ce2e4c..6975fdc19 100644 --- a/src/libretro/Makefile.common +++ b/src/os/libretro/Makefile.common @@ -1,14 +1,14 @@ LIBRETRO_COMM_DIR = $(CORE_DIR)/../libretro-common -INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/json -I$(CORE_DIR)/httplib -I$(CORE_DIR)/sqlite +INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/os/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/lib/json -I$(CORE_DIR)/lib/httplib -I$(CORE_DIR)/lib/sqlite ifneq (,$(findstring msvc2003,$(platform))) INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc endif SOURCES_CXX := \ - $(CORE_DIR)/libretro/libretro.cxx \ - $(CORE_DIR)/libretro/FSNodeLIBRETRO.cxx \ - $(CORE_DIR)/libretro/StellaLIBRETRO.cxx \ + $(CORE_DIR)/os/libretro/libretro.cxx \ + $(CORE_DIR)/os/libretro/FSNodeLIBRETRO.cxx \ + $(CORE_DIR)/os/libretro/StellaLIBRETRO.cxx \ $(CORE_DIR)/common/AudioQueue.cxx \ $(CORE_DIR)/common/AudioSettings.cxx \ $(CORE_DIR)/common/Base.cxx \ diff --git a/src/libretro/OSystemLIBRETRO.hxx b/src/os/libretro/OSystemLIBRETRO.hxx similarity index 100% rename from src/libretro/OSystemLIBRETRO.hxx rename to src/os/libretro/OSystemLIBRETRO.hxx diff --git a/src/libretro/SoundLIBRETRO.hxx b/src/os/libretro/SoundLIBRETRO.hxx similarity index 100% rename from src/libretro/SoundLIBRETRO.hxx rename to src/os/libretro/SoundLIBRETRO.hxx diff --git a/src/libretro/Stella.vcxproj b/src/os/libretro/Stella.vcxproj similarity index 100% rename from src/libretro/Stella.vcxproj rename to src/os/libretro/Stella.vcxproj diff --git a/src/libretro/StellaLIBRETRO.cxx b/src/os/libretro/StellaLIBRETRO.cxx similarity index 100% rename from src/libretro/StellaLIBRETRO.cxx rename to src/os/libretro/StellaLIBRETRO.cxx diff --git a/src/libretro/StellaLIBRETRO.hxx b/src/os/libretro/StellaLIBRETRO.hxx similarity index 100% rename from src/libretro/StellaLIBRETRO.hxx rename to src/os/libretro/StellaLIBRETRO.hxx diff --git a/src/libretro/jni/Android.mk b/src/os/libretro/jni/Android.mk similarity index 91% rename from src/libretro/jni/Android.mk rename to src/os/libretro/jni/Android.mk index 644f983ae..a43b28239 100644 --- a/src/libretro/jni/Android.mk +++ b/src/os/libretro/jni/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) CORE_DIR := $(LOCAL_PATH)/../.. -include $(CORE_DIR)/libretro/Makefile.common +include $(CORE_DIR)/os/libretro/Makefile.common COREFLAGS := -DANDROID -D__LIB_RETRO__ -DHAVE_STRINGS_H -DSOUND_SUPPORT $(INCFLAGS) diff --git a/src/libretro/jni/Application.mk b/src/os/libretro/jni/Application.mk similarity index 100% rename from src/libretro/jni/Application.mk rename to src/os/libretro/jni/Application.mk diff --git a/src/libretro/libretro.cxx b/src/os/libretro/libretro.cxx similarity index 100% rename from src/libretro/libretro.cxx rename to src/os/libretro/libretro.cxx diff --git a/src/libretro/libretro.h b/src/os/libretro/libretro.h similarity index 100% rename from src/libretro/libretro.h rename to src/os/libretro/libretro.h diff --git a/src/libretro/link.T b/src/os/libretro/link.T similarity index 100% rename from src/libretro/link.T rename to src/os/libretro/link.T diff --git a/src/macos/.gitignore b/src/os/macos/.gitignore similarity index 100% rename from src/macos/.gitignore rename to src/os/macos/.gitignore diff --git a/src/macos/AboutBox.h b/src/os/macos/AboutBox.h similarity index 100% rename from src/macos/AboutBox.h rename to src/os/macos/AboutBox.h diff --git a/src/macos/AboutBox.m b/src/os/macos/AboutBox.m similarity index 100% rename from src/macos/AboutBox.m rename to src/os/macos/AboutBox.m diff --git a/src/macos/AboutBox.nib/designable.nib b/src/os/macos/AboutBox.nib/designable.nib similarity index 100% rename from src/macos/AboutBox.nib/designable.nib rename to src/os/macos/AboutBox.nib/designable.nib diff --git a/src/macos/AboutBox.nib/keyedobjects.nib b/src/os/macos/AboutBox.nib/keyedobjects.nib similarity index 100% rename from src/macos/AboutBox.nib/keyedobjects.nib rename to src/os/macos/AboutBox.nib/keyedobjects.nib diff --git a/src/macos/AboutBoxTextView.h b/src/os/macos/AboutBoxTextView.h similarity index 100% rename from src/macos/AboutBoxTextView.h rename to src/os/macos/AboutBoxTextView.h diff --git a/src/macos/AboutBoxTextView.m b/src/os/macos/AboutBoxTextView.m similarity index 100% rename from src/macos/AboutBoxTextView.m rename to src/os/macos/AboutBoxTextView.m diff --git a/src/macos/Cart.icns b/src/os/macos/Cart.icns similarity index 100% rename from src/macos/Cart.icns rename to src/os/macos/Cart.icns diff --git a/src/macos/Create_build.sh b/src/os/macos/Create_build.sh similarity index 100% rename from src/macos/Create_build.sh rename to src/os/macos/Create_build.sh diff --git a/src/macos/Credits.html b/src/os/macos/Credits.html similarity index 100% rename from src/macos/Credits.html rename to src/os/macos/Credits.html diff --git a/src/macos/Info-Stella.plist b/src/os/macos/Info-Stella.plist similarity index 100% rename from src/macos/Info-Stella.plist rename to src/os/macos/Info-Stella.plist diff --git a/src/macos/OSystemMACOS.cxx b/src/os/macos/OSystemMACOS.cxx similarity index 100% rename from src/macos/OSystemMACOS.cxx rename to src/os/macos/OSystemMACOS.cxx diff --git a/src/macos/OSystemMACOS.hxx b/src/os/macos/OSystemMACOS.hxx similarity index 100% rename from src/macos/OSystemMACOS.hxx rename to src/os/macos/OSystemMACOS.hxx diff --git a/src/macos/SDLMain.h b/src/os/macos/SDLMain.h similarity index 100% rename from src/macos/SDLMain.h rename to src/os/macos/SDLMain.h diff --git a/src/macos/SDLMain.m b/src/os/macos/SDLMain.m similarity index 100% rename from src/macos/SDLMain.m rename to src/os/macos/SDLMain.m diff --git a/src/macos/SDLMain.nib/designable.nib b/src/os/macos/SDLMain.nib/designable.nib similarity index 100% rename from src/macos/SDLMain.nib/designable.nib rename to src/os/macos/SDLMain.nib/designable.nib diff --git a/src/macos/SDLMain.nib/keyedobjects.nib b/src/os/macos/SDLMain.nib/keyedobjects.nib similarity index 100% rename from src/macos/SDLMain.nib/keyedobjects.nib rename to src/os/macos/SDLMain.nib/keyedobjects.nib diff --git a/src/macos/SerialPortMACOS.cxx b/src/os/macos/SerialPortMACOS.cxx similarity index 100% rename from src/macos/SerialPortMACOS.cxx rename to src/os/macos/SerialPortMACOS.cxx diff --git a/src/macos/SerialPortMACOS.hxx b/src/os/macos/SerialPortMACOS.hxx similarity index 100% rename from src/macos/SerialPortMACOS.hxx rename to src/os/macos/SerialPortMACOS.hxx diff --git a/src/macos/SettingsRepositoryMACOS.hxx b/src/os/macos/SettingsRepositoryMACOS.hxx similarity index 100% rename from src/macos/SettingsRepositoryMACOS.hxx rename to src/os/macos/SettingsRepositoryMACOS.hxx diff --git a/src/macos/SettingsRepositoryMACOS.mm b/src/os/macos/SettingsRepositoryMACOS.mm similarity index 100% rename from src/macos/SettingsRepositoryMACOS.mm rename to src/os/macos/SettingsRepositoryMACOS.mm diff --git a/src/macos/Stella.icns b/src/os/macos/Stella.icns similarity index 100% rename from src/macos/Stella.icns rename to src/os/macos/Stella.icns diff --git a/src/macos/en.lproj/InfoPlist.strings b/src/os/macos/en.lproj/InfoPlist.strings similarity index 100% rename from src/macos/en.lproj/InfoPlist.strings rename to src/os/macos/en.lproj/InfoPlist.strings diff --git a/src/macos/stella.xcodeproj/project.pbxproj b/src/os/macos/stella.xcodeproj/project.pbxproj similarity index 100% rename from src/macos/stella.xcodeproj/project.pbxproj rename to src/os/macos/stella.xcodeproj/project.pbxproj diff --git a/src/macos/template.dmg.gz b/src/os/macos/template.dmg.gz similarity index 100% rename from src/macos/template.dmg.gz rename to src/os/macos/template.dmg.gz diff --git a/src/unix/OSystemUNIX.cxx b/src/os/unix/OSystemUNIX.cxx similarity index 100% rename from src/unix/OSystemUNIX.cxx rename to src/os/unix/OSystemUNIX.cxx diff --git a/src/unix/OSystemUNIX.hxx b/src/os/unix/OSystemUNIX.hxx similarity index 100% rename from src/unix/OSystemUNIX.hxx rename to src/os/unix/OSystemUNIX.hxx diff --git a/src/unix/SerialPortUNIX.cxx b/src/os/unix/SerialPortUNIX.cxx similarity index 100% rename from src/unix/SerialPortUNIX.cxx rename to src/os/unix/SerialPortUNIX.cxx diff --git a/src/unix/SerialPortUNIX.hxx b/src/os/unix/SerialPortUNIX.hxx similarity index 100% rename from src/unix/SerialPortUNIX.hxx rename to src/os/unix/SerialPortUNIX.hxx diff --git a/src/os/unix/module.mk b/src/os/unix/module.mk new file mode 100644 index 000000000..a382a82e2 --- /dev/null +++ b/src/os/unix/module.mk @@ -0,0 +1,11 @@ +MODULE := src/os/unix + +MODULE_OBJS := \ + src/os/unix/OSystemUNIX.o \ + src/os/unix/SerialPortUNIX.o + +MODULE_DIRS += \ + src/os/unix + +# Include common rules +include $(srcdir)/common.rules diff --git a/src/unix/r77/OSystemR77.cxx b/src/os/unix/r77/OSystemR77.cxx similarity index 100% rename from src/unix/r77/OSystemR77.cxx rename to src/os/unix/r77/OSystemR77.cxx diff --git a/src/unix/r77/OSystemR77.hxx b/src/os/unix/r77/OSystemR77.hxx similarity index 100% rename from src/unix/r77/OSystemR77.hxx rename to src/os/unix/r77/OSystemR77.hxx diff --git a/src/unix/r77/SettingsR77.cxx b/src/os/unix/r77/SettingsR77.cxx similarity index 100% rename from src/unix/r77/SettingsR77.cxx rename to src/os/unix/r77/SettingsR77.cxx diff --git a/src/unix/r77/SettingsR77.hxx b/src/os/unix/r77/SettingsR77.hxx similarity index 100% rename from src/unix/r77/SettingsR77.hxx rename to src/os/unix/r77/SettingsR77.hxx diff --git a/src/unix/r77/module.mk b/src/os/unix/r77/module.mk similarity index 100% rename from src/unix/r77/module.mk rename to src/os/unix/r77/module.mk diff --git a/src/unix/stella.desktop b/src/os/unix/stella.desktop similarity index 100% rename from src/unix/stella.desktop rename to src/os/unix/stella.desktop diff --git a/src/unix/stella.spec b/src/os/unix/stella.spec similarity index 100% rename from src/unix/stella.spec rename to src/os/unix/stella.spec diff --git a/src/windows/Create_Builds.bat b/src/os/windows/Create_Builds.bat similarity index 86% rename from src/windows/Create_Builds.bat rename to src/os/windows/Create_Builds.bat index 984e9e96e..b19eb0ef6 100644 --- a/src/windows/Create_Builds.bat +++ b/src/os/windows/Create_Builds.bat @@ -97,14 +97,14 @@ if %BUILD_64% == 1 ( ) echo Copying DOC files ... -xcopy ..\..\docs\* %STELLA_DIR%\docs /s /q -copy ..\..\Announce.txt %STELLA_DIR%\docs -copy ..\..\Changes.txt %STELLA_DIR%\docs -copy ..\..\Copyright.txt %STELLA_DIR%\docs -copy ..\..\License.txt %STELLA_DIR%\docs -copy ..\..\Readme.txt %STELLA_DIR%\docs -copy ..\..\README-SDL.txt %STELLA_DIR%\docs -copy ..\..\Todo.txt %STELLA_DIR%\docs +xcopy ..\..\..\docs\* %STELLA_DIR%\docs /s /q +copy ..\..\..\Announce.txt %STELLA_DIR%\docs +copy ..\..\..\Changes.txt %STELLA_DIR%\docs +copy ..\..\..\Copyright.txt %STELLA_DIR%\docs +copy ..\..\..\License.txt %STELLA_DIR%\docs +copy ..\..\..\Readme.txt %STELLA_DIR%\docs +copy ..\..\..\README-SDL.txt %STELLA_DIR%\docs +copy ..\..\..\Todo.txt %STELLA_DIR%\docs if %HAVE_FLIP% == 1 ( for %%a in (%STELLA_DIR%\docs\*.txt) do ( flip -d "%%a" diff --git a/src/windows/FSNodeWINDOWS.cxx b/src/os/windows/FSNodeWINDOWS.cxx similarity index 100% rename from src/windows/FSNodeWINDOWS.cxx rename to src/os/windows/FSNodeWINDOWS.cxx diff --git a/src/windows/FSNodeWINDOWS.hxx b/src/os/windows/FSNodeWINDOWS.hxx similarity index 100% rename from src/windows/FSNodeWINDOWS.hxx rename to src/os/windows/FSNodeWINDOWS.hxx diff --git a/src/windows/HomeFinder.hxx b/src/os/windows/HomeFinder.hxx similarity index 100% rename from src/windows/HomeFinder.hxx rename to src/os/windows/HomeFinder.hxx diff --git a/src/windows/OSystemWINDOWS.cxx b/src/os/windows/OSystemWINDOWS.cxx similarity index 100% rename from src/windows/OSystemWINDOWS.cxx rename to src/os/windows/OSystemWINDOWS.cxx diff --git a/src/windows/OSystemWINDOWS.hxx b/src/os/windows/OSystemWINDOWS.hxx similarity index 100% rename from src/windows/OSystemWINDOWS.hxx rename to src/os/windows/OSystemWINDOWS.hxx diff --git a/src/windows/SerialPortWINDOWS.cxx b/src/os/windows/SerialPortWINDOWS.cxx similarity index 93% rename from src/windows/SerialPortWINDOWS.cxx rename to src/os/windows/SerialPortWINDOWS.cxx index c8448fba6..3a015defd 100644 --- a/src/windows/SerialPortWINDOWS.cxx +++ b/src/os/windows/SerialPortWINDOWS.cxx @@ -62,7 +62,7 @@ bool SerialPortWINDOWS::openPort(const string& device) dcb.StopBits = ONESTOPBIT; SetCommState(myHandle, &dcb); - COMMTIMEOUTS commtimeouts; + COMMTIMEOUTS commtimeouts{0}; commtimeouts.ReadIntervalTimeout = MAXDWORD; commtimeouts.ReadTotalTimeoutMultiplier = 0; commtimeouts.ReadTotalTimeoutConstant = 1; @@ -82,7 +82,7 @@ bool SerialPortWINDOWS::readByte(uInt8& data) if(myHandle != INVALID_HANDLE_VALUE) { DWORD read; - ReadFile(myHandle, &data, 1, &read, NULL); + std::ignore = ReadFile(myHandle, &data, 1, &read, NULL); return read == 1; } return false; @@ -94,7 +94,7 @@ bool SerialPortWINDOWS::writeByte(uInt8 data) if(myHandle != INVALID_HANDLE_VALUE) { DWORD written; - WriteFile(myHandle, &data, 1, &written, NULL); + std::ignore = WriteFile(myHandle, &data, 1, &written, NULL); return written == 1; } return false; @@ -106,7 +106,7 @@ bool SerialPortWINDOWS::isCTS() if(myHandle != INVALID_HANDLE_VALUE) { DWORD modemStat; - GetCommModemStatus(myHandle, &modemStat); + std::ignore = GetCommModemStatus(myHandle, &modemStat); return modemStat & MS_CTS_ON; } return false; @@ -147,10 +147,7 @@ StringList SerialPortWINDOWS::portNames() RegCloseKey(hKey); std::sort(ports.begin(), ports.end(), - [](const std::string& a, const std::string& b) - { - return a < b; - } + [](const std::string& a, const std::string& b) { return a < b; } ); return ports; diff --git a/src/windows/SerialPortWINDOWS.hxx b/src/os/windows/SerialPortWINDOWS.hxx similarity index 100% rename from src/windows/SerialPortWINDOWS.hxx rename to src/os/windows/SerialPortWINDOWS.hxx diff --git a/src/windows/Stella.sln b/src/os/windows/Stella.sln similarity index 100% rename from src/windows/Stella.sln rename to src/os/windows/Stella.sln diff --git a/src/windows/Stella.vcxproj b/src/os/windows/Stella.vcxproj similarity index 71% rename from src/windows/Stella.vcxproj rename to src/os/windows/Stella.vcxproj index 6f6397816..23e6afe8b 100755 --- a/src/windows/Stella.vcxproj +++ b/src/os/windows/Stella.vcxproj @@ -249,7 +249,7 @@ Disabled - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;..\..\lib\httplib;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions) false EnableFastChecks @@ -283,7 +283,7 @@ Disabled - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) false EnableFastChecks @@ -320,7 +320,7 @@ Disabled - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;..\..\lib\httplib;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions) false EnableFastChecks @@ -356,7 +356,7 @@ Disabled - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) false EnableFastChecks @@ -390,7 +390,7 @@ true true - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;..\..\lib\httplib;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -425,7 +425,7 @@ true true - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;..\..\lib\httplib;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -460,7 +460,7 @@ true false - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -499,7 +499,7 @@ MaxSpeed AnySuitable true - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;..\..\lib\httplib;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -538,7 +538,7 @@ MaxSpeed AnySuitable true - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;..\httplib;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;..\..\lib\httplib;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;HTTP_LIB_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -577,7 +577,7 @@ Full Default true - ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;..\json;..\common\repository\sqlite;..\sqlite;..\nanojpeg;..\tinyexif;%(AdditionalIncludeDirectories) + ..\..\debugger\yacc;..\..\emucore;..\..\emucore\tia;..\..\emucore\tia\frame-manager;..\..\common;..\..\common\tv_filters;..\..\gui;..\..\debugger\gui;..\..\debugger;..\..\os\windows;..\..\cheat;..\..\lib\zlib;..\..\lib\libpng;..\..\lib\json;..\..\common\repository\sqlite;..\..\lib\sqlite;..\..\lib\nanojpeg;..\..\lib\tinyexif;%(AdditionalIncludeDirectories) BSPF_WINDOWS;WIN32;NOMINMAX;NDEBUG;SDL_SUPPORT;GUI_SUPPORT;IMAGE_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -608,339 +608,338 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true - + true - + true - + true - + true - + true - + true - - + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - + + true - + true - + true - + true - + true - + true - + true - + true - + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsC CompileAsC CompileAsC @@ -952,175 +951,175 @@ CompileAsC CompileAsC - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsC CompileAsC CompileAsC @@ -1142,7 +1141,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1164,7 +1163,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1186,7 +1185,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1208,7 +1207,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1230,7 +1229,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1252,7 +1251,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1274,7 +1273,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1296,7 +1295,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1318,7 +1317,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1340,7 +1339,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1362,7 +1361,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1384,7 +1383,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1406,7 +1405,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1428,7 +1427,7 @@ Level2 Level2 - + CompileAsC CompileAsC CompileAsC @@ -1450,7 +1449,7 @@ Level2 Level2 - + Level2 Level2 Level2 @@ -1472,7 +1471,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1494,7 +1493,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1516,7 +1515,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1538,7 +1537,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1560,7 +1559,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1582,7 +1581,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1604,7 +1603,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1626,7 +1625,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1648,7 +1647,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1670,7 +1669,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1692,7 +1691,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1714,7 +1713,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1736,7 +1735,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1758,7 +1757,7 @@ CompileAsC CompileAsC - + Level2 Level2 Level2 @@ -1782,609 +1781,608 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true - + true - + true - + true - + true - + true - - + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/os/windows/Stella.vcxproj.filters b/src/os/windows/Stella.vcxproj.filters new file mode 100644 index 000000000..45326fdf0 --- /dev/null +++ b/src/os/windows/Stella.vcxproj.filters @@ -0,0 +1,2449 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {5188eb42-0dec-46ba-b181-46760495045d} + + + {668555cd-5471-4274-8f88-ada71c1994ec} + + + {65430770-f470-43b9-b3ee-0fb9c1b1048d} + + + {e031c7d2-674c-472b-9a04-70707ac75a7e} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {fe8200d9-0cf5-4591-8a11-74b7ac2d9095} + + + {6e05e22d-63c1-469a-abd6-0c768e73f573} + + + {22234c67-4cb3-43d1-ab09-94b81fc02aed} + + + {ccb2b3e4-7db7-4397-8160-5a68059c656e} + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {81542c6c-60bf-4329-8243-f5caad4deffa} + + + {ffa3642d-aa8a-43a5-8ac5-acd8878dd091} + + + {49d8ea64-20c1-45f1-9dc9-b39c17d7cabd} + + + {000e4a6b-8cd6-43db-8253-8255c7efa706} + + + {fb5429b5-4ffb-4574-a98d-54ba865e4199} + + + {6960ed3f-a5e0-4af6-af20-e9308167ae63} + + + {1aab46fa-ee39-415d-9e41-d5ad3ee14ce7} + + + {21af5583-5f53-4c1d-96d1-05ceaa2d6bae} + + + {47b68040-eac2-4f3c-82d1-eceb7a6e6b7b} + + + {456bc377-aa1c-4601-894a-2385d91f83c4} + + + {e216a718-4078-4a08-b134-4987ec071e31} + + + {966c18c1-dae3-4dae-8e00-c621187898b1} + + + {b4ef4876-8f8c-4035-bc4a-0cbdbe2a5a44} + + + {7836da03-0e67-481a-b16a-529a1042d215} + + + {1d446ef0-61e1-42e4-a025-8629bfdca1af} + + + {438b21ed-1358-478c-af80-8ac809dd9709} + + + {ab671015-c65e-4fac-83e0-516188525b73} + + + {6ae0e432-d0ce-419a-8909-bc4c03fc0e23} + + + {78160f63-326d-4e93-b808-598f5c979300} + + + {9ca218eb-55db-44fa-abba-f20cf9d69d48} + + + {667527a4-a1a4-43d8-8d36-21c75d317ea0} + + + {ea737878-f4b5-4334-a356-353c6b68bdcd} + + + {e46a6b4a-4da4-4842-ac5b-65a6b45edc86} + + + {31501e98-40f8-4bcd-bf6f-52b133725061} + + + {784bd01b-df5b-40b9-9119-6fff5281f307} + + + {7e8254e5-72fa-4b53-9fde-7cf813f15562} + + + {35c5d24b-abca-42fc-8927-63a43612d184} + + + {f379898f-6732-4ffd-ab68-28b275790ca8} + + + {ee0eac0c-bfb9-4009-bfe2-1da3c7392a3b} + + + {5825497d-8a3a-4d66-8f1a-b8f381d22204} + + + {ea74c030-5085-43da-9800-64525764ad3b} + + + {30c7f8db-f036-4f42-8edf-88d7773a05b0} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\cheat + + + Source Files\cheat + + + Source Files\cheat + + + Source Files\cheat + + + Source Files\cheat + + + Source Files\debugger + + + Source Files\debugger + + + Source Files\debugger + + + Source Files\debugger + + + Source Files\debugger + + + Source Files\debugger + + + Source Files\debugger + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\zlib + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\lib\libpng + + + Source Files\gui + + + Source Files + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files + + + Source Files\emucore + + + Source Files + + + Source Files + + + Source Files\gui + + + Source Files\gui + + + Source Files + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files + + + Source Files\emucore + + + Source Files\gui + + + Source Files\emucore + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\gui + + + Source Files\emucore + + + Source Files + + + Source Files + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files\gui + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\emucore\tia + + + Source Files\emucore\tia + + + Source Files + + + Source Files\emucore + + + Source Files\audio + + + Source Files\audio + + + Source Files\audio + + + Source Files\emucore + + + Source Files\emucore + + + Source Files + + + Source Files + + + Source Files\audio + + + Source Files + + + Source Files\emucore + + + Source Files + + + Source Files + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\gui + + + Source Files\gui + + + Source Files + + + Source Files\gui + + + Source Files + + + Source Files\debugger + + + Source Files\emucore + + + Source Files + + + Source Files\emucore + + + Source Files\gui + + + Source Files\gui + + + Source Files + + + Source Files\gui + + + Source Files\gui + + + Source Files\emucore + + + Source Files\emucore + + + Source Files + + + Source Files\gui + + + Source Files\gui + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\gui + + + Source Files\emucore + + + Source Files\gui + + + Source Files + + + Source Files\gui + + + Source Files\gui + + + Source Files\emucore + + + Source Files\repository\sqlite + + + Source Files\repository\sqlite + + + Source Files\repository\sqlite + + + Source Files\repository\sqlite + + + Source Files\lib\sqlite\source + + + Source Files\repository\sqlite + + + Source Files\repository\sqlite + + + Source Files\repository + + + Source Files\repository + + + Source Files\repository + + + Source Files\repository + + + Source Files\repository\sqlite + + + Source Files\emucore + + + Source Files\repository + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\gui + + + Source Files\gui + + + Source Files\emucore + + + Source Files\emucore + + + Source Files + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\emucore + + + Source Files\emucore + + + Source Files\gui + + + Source Files + + + Source Files\lib\tinyexif + + + Source Files\debugger\yacc + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\debugger\gui + + + Source Files\tv_filters + + + Source Files\tv_filters + + + Source Files\sdl_blitter + + + Source Files\sdl_blitter + + + Source Files\sdl_blitter + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\debugger + + + Header Files\cheat + + + Header Files\cheat + + + Header Files\cheat + + + Header Files\cheat + + + Header Files\cheat + + + Header Files\cheat + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\zlib + + + Header Files\lib\libpng + + + Header Files\lib\libpng + + + Header Files\lib\libpng + + + Header Files\lib\libpng + + + Header Files\lib\libpng + + + Header Files\lib\libpng + + + Header Files\lib\libpng + + + Header Files + + + Header Files\gui + + + Header Files + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files + + + Header Files\emucore + + + Header Files + + + Header Files\emucore + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\gui + + + Header Files + + + Header Files\gui + + + Header Files + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files + + + Header Files + + + Header Files\emucore + + + Header Files\gui + + + Header Files\emucore + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore\tia + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore + + + Header Files\gui + + + Header Files\emucore + + + Header Files + + + Header Files + + + Header Files\debugger + + + Header Files + + + Header Files\gui + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files\gui + + + Header Files + + + Header Files + + + Header Files + + + Header Files\emucore\tia + + + Header Files\emucore\tia + + + Header Files + + + Header Files\emucore + + + Header Files\audio + + + Header Files\audio + + + Header Files\audio + + + Header Files\audio + + + Header Files\emucore + + + Header Files\emucore + + + Header Files + + + Header Files + + + Header Files\audio + + + Header Files + + + Header Files\emucore + + + Header Files\emucore\exception + + + Header Files + + + Header Files\emucore\exception + + + Header Files + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\gui + + + Header Files\emucore + + + Header Files\gui + + + Header Files\repository + + + Header Files\repository + + + Header Files + + + Header Files + + + Header Files\gui + + + Header Files + + + Header Files + + + Header Files\debugger + + + Header Files\emucore + + + Header Files + + + Header Files\emucore + + + Header Files\gui + + + Header Files\gui + + + Header Files + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\emucore + + + Header Files\emucore + + + Header Files + + + Header Files\gui + + + Header Files\gui + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\gui + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\gui + + + Header Files + + + Header Files + + + Header Files\emucore + + + Header Files\gui + + + Header Files\gui + + + Header Files\lib\json + + + Header Files\lib\json + + + Header Files + + + Header Files\emucore + + + Header Files\repository\sqlite + + + Header Files\repository\sqlite + + + Header Files\repository\sqlite + + + Header Files\repository\sqlite + + + Header Files\repository\sqlite + + + Header Files\lib\sqlite + + + Header Files\lib\sqlite\source + + + Header Files\repository + + + Header Files\repository\sqlite + + + Header Files\repository\sqlite + + + Header Files\repository + + + Header Files\repository + + + Header Files\repository + + + Header Files\repository + + + Header Files\repository + + + Header Files\repository + + + Header Files\lib\sqlite + + + Header Files\repository\sqlite + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\gui + + + Header Files\gui + + + Header Files\emucore + + + Header Files\emucore + + + Header Files + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\lib\httplib + + + Header Files\lib\httplib + + + Header Files + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\emucore + + + Header Files\gui + + + Header Files + + + Header Files\lib\nanojpeg + + + Header Files\lib\tinyexif + + + Header Files\debugger\yacc + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\debugger\gui + + + Header Files\tv_filters + + + Header Files\tv_filters + + + Header Files\sdl_blitter + + + Header Files\sdl_blitter + + + Header Files\sdl_blitter + + + Header Files\sdl_blitter + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/windows/Windows.hxx b/src/os/windows/Windows.hxx similarity index 100% rename from src/windows/Windows.hxx rename to src/os/windows/Windows.hxx diff --git a/src/os/windows/module.mk b/src/os/windows/module.mk new file mode 100644 index 000000000..a4745ed0b --- /dev/null +++ b/src/os/windows/module.mk @@ -0,0 +1,14 @@ +MODULE := src/os/windows + +MODULE_OBJS := \ + src/os/windows/FSNodeWINDOWS.o \ + src/os/windows/OSystemWINDOWS.o \ + src/os/windows/SerialPortWINDOWS.o \ + src/os/windows/SettingsWINDOWS.o \ + src/os/windows/stella_icon.o + +MODULE_DIRS += \ + src/os/windows + +# Include common rules +include $(srcdir)/common.rules diff --git a/src/windows/resource.h b/src/os/windows/resource.h similarity index 100% rename from src/windows/resource.h rename to src/os/windows/resource.h diff --git a/src/windows/stella.ico b/src/os/windows/stella.ico similarity index 100% rename from src/windows/stella.ico rename to src/os/windows/stella.ico diff --git a/src/windows/stella.iss b/src/os/windows/stella.iss similarity index 100% rename from src/windows/stella.iss rename to src/os/windows/stella.iss diff --git a/src/windows/stella.rc b/src/os/windows/stella.rc similarity index 100% rename from src/windows/stella.rc rename to src/os/windows/stella.rc diff --git a/src/windows/Stella.vcxproj.filters b/src/windows/Stella.vcxproj.filters deleted file mode 100644 index d660b5a2b..000000000 --- a/src/windows/Stella.vcxproj.filters +++ /dev/null @@ -1,2417 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {5188eb42-0dec-46ba-b181-46760495045d} - - - {668555cd-5471-4274-8f88-ada71c1994ec} - - - {65430770-f470-43b9-b3ee-0fb9c1b1048d} - - - {e031c7d2-674c-472b-9a04-70707ac75a7e} - - - {31501e98-40f8-4bcd-bf6f-52b133725061} - - - {9ca218eb-55db-44fa-abba-f20cf9d69d48} - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {fe8200d9-0cf5-4591-8a11-74b7ac2d9095} - - - {6e05e22d-63c1-469a-abd6-0c768e73f573} - - - {22234c67-4cb3-43d1-ab09-94b81fc02aed} - - - {ccb2b3e4-7db7-4397-8160-5a68059c656e} - - - {6ae0e432-d0ce-419a-8909-bc4c03fc0e23} - - - {b4ef4876-8f8c-4035-bc4a-0cbdbe2a5a44} - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {81542c6c-60bf-4329-8243-f5caad4deffa} - - - {ffa3642d-aa8a-43a5-8ac5-acd8878dd091} - - - {49d8ea64-20c1-45f1-9dc9-b39c17d7cabd} - - - {000e4a6b-8cd6-43db-8253-8255c7efa706} - - - {fb5429b5-4ffb-4574-a98d-54ba865e4199} - - - {6960ed3f-a5e0-4af6-af20-e9308167ae63} - - - {1aab46fa-ee39-415d-9e41-d5ad3ee14ce7} - - - {966c18c1-dae3-4dae-8e00-c621187898b1} - - - {21af5583-5f53-4c1d-96d1-05ceaa2d6bae} - - - {47b68040-eac2-4f3c-82d1-eceb7a6e6b7b} - - - {1d446ef0-61e1-42e4-a025-8629bfdca1af} - - - {438b21ed-1358-478c-af80-8ac809dd9709} - - - {667527a4-a1a4-43d8-8d36-21c75d317ea0} - - - {ea737878-f4b5-4334-a356-353c6b68bdcd} - - - {e216a718-4078-4a08-b134-4987ec071e31} - - - {7836da03-0e67-481a-b16a-529a1042d215} - - - {ab671015-c65e-4fac-83e0-516188525b73} - - - {e46a6b4a-4da4-4842-ac5b-65a6b45edc86} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\cheat - - - Source Files\cheat - - - Source Files\cheat - - - Source Files\cheat - - - Source Files\cheat - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\libpng - - - Source Files\gui - - - Source Files - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\emucore - - - Source Files - - - Source Files - - - Source Files\emucore - - - Source Files - - - Source Files - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\gui - - - Source Files\debugger - - - Source Files\gui - - - Source Files - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\emucore - - - Source Files\debugger - - - Source Files - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\gui - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\emucore - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\debugger - - - Source Files - - - Source Files\emucore - - - Source Files\gui - - - Source Files\emucore - - - Source Files - - - Source Files - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\debugger - - - Source Files\gui - - - Source Files\debugger - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files\gui - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\emucore\tia - - - Source Files\emucore\tia - - - Source Files - - - Source Files\emucore - - - Source Files\audio - - - Source Files\audio - - - Source Files\audio - - - Source Files\emucore - - - Source Files\emucore - - - Source Files - - - Source Files - - - Source Files\audio - - - Source Files - - - Source Files\emucore - - - Source Files - - - Source Files - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\gui - - - Source Files\gui - - - Source Files - - - Source Files\gui - - - Source Files - - - Source Files\debugger - - - Source Files\emucore - - - Source Files\debugger - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\emucore - - - Source Files\gui - - - Source Files\gui - - - Source Files - - - Source Files\gui - - - Source Files\gui - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\emucore - - - Source Files - - - Source Files\gui - - - Source Files\gui - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\gui - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\gui - - - Source Files\debugger - - - Source Files - - - Source Files\gui - - - Source Files\gui - - - Source Files\debugger - - - Source Files\emucore - - - Source Files\repository\sqlite - - - Source Files\repository\sqlite - - - Source Files\repository\sqlite - - - Source Files\repository\sqlite - - - Source Files\sqlite\source - - - Source Files\repository\sqlite - - - Source Files\repository\sqlite - - - Source Files\repository - - - Source Files\repository - - - Source Files\repository - - - Source Files\repository - - - Source Files\repository\sqlite - - - Source Files\emucore - - - Source Files\repository - - - Source Files\emucore - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\gui - - - Source Files\gui - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\emucore - - - Source Files - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\debugger - - - Source Files - - - Source Files\emucore - - - Source Files\debugger - - - Source Files\gui - - - Source Files - - - Source Files\tinyexif - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\cheat - - - Header Files\cheat - - - Header Files\cheat - - - Header Files\cheat - - - Header Files\cheat - - - Header Files\cheat - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\zlib - - - Header Files\libpng - - - Header Files\libpng - - - Header Files\libpng - - - Header Files\libpng - - - Header Files\libpng - - - Header Files\libpng - - - Header Files\libpng - - - Header Files - - - Header Files\gui - - - Header Files - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files - - - Header Files\emucore - - - Header Files - - - Header Files - - - Header Files\emucore - - - Header Files - - - Header Files - - - Header Files - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\gui - - - Header Files - - - Header Files\debugger - - - Header Files\gui - - - Header Files - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\emucore - - - Header Files\debugger - - - Header Files - - - Header Files - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\gui - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\emucore - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore\tia - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files - - - Header Files\emucore - - - Header Files\gui - - - Header Files\emucore - - - Header Files - - - Header Files - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files\debugger - - - Header Files - - - Header Files\gui - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files\gui - - - Header Files - - - Header Files - - - Header Files - - - Header Files\emucore\tia - - - Header Files\emucore\tia - - - Header Files - - - Header Files\emucore - - - Header Files\audio - - - Header Files\audio - - - Header Files\audio - - - Header Files\audio - - - Header Files\emucore - - - Header Files\emucore - - - Header Files - - - Header Files - - - Header Files\audio - - - Header Files - - - Header Files\emucore - - - Header Files\emucore\exception - - - Header Files - - - Header Files\emucore\exception - - - Header Files - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\gui - - - Header Files\emucore - - - Header Files\gui - - - Header Files\repository - - - Header Files\repository - - - Header Files - - - Header Files - - - Header Files\gui - - - Header Files - - - Header Files - - - Header Files\debugger - - - Header Files\emucore - - - Header Files\debugger - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\emucore - - - Header Files\gui - - - Header Files\gui - - - Header Files - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\emucore - - - Header Files - - - Header Files\gui - - - Header Files\gui - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\gui - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\gui - - - Header Files - - - Header Files\debugger - - - Header Files - - - Header Files\emucore - - - Header Files\gui - - - Header Files\gui - - - Header Files\debugger - - - Header Files\json - - - Header Files\json - - - Header Files - - - Header Files\emucore - - - Header Files\repository\sqlite - - - Header Files\repository\sqlite - - - Header Files\repository\sqlite - - - Header Files\repository\sqlite - - - Header Files\repository\sqlite - - - Header Files\sqlite - - - Header Files\sqlite\source - - - Header Files\repository - - - Header Files\repository\sqlite - - - Header Files\repository\sqlite - - - Header Files\repository - - - Header Files\repository - - - Header Files\repository - - - Header Files\repository - - - Header Files\repository - - - Header Files\repository - - - Header Files\sqlite - - - Header Files\repository\sqlite - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\gui - - - Header Files\gui - - - Header Files\debugger - - - Header Files\emucore - - - Header Files\emucore - - - Header Files - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\gui - - - Header Files\httplib - - - Header Files\httplib - - - Header Files - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\debugger - - - Header Files - - - Header Files\emucore - - - Header Files\debugger - - - Header Files\gui - - - Header Files - - - Header Files\nanojpeg - - - Header Files\tinyexif - - - - - Resource Files - - - - - - Resource Files - - - \ No newline at end of file diff --git a/src/windows/module.mk b/src/windows/module.mk deleted file mode 100644 index 8d26aa62d..000000000 --- a/src/windows/module.mk +++ /dev/null @@ -1,14 +0,0 @@ -MODULE := src/windows - -MODULE_OBJS := \ - src/windows/FSNodeWINDOWS.o \ - src/windows/OSystemWINDOWS.o \ - src/windows/SerialPortWINDOWS.o \ - src/windows/SettingsWINDOWS.o \ - src/windows/stella_icon.o - -MODULE_DIRS += \ - src/windows - -# Include common rules -include $(srcdir)/common.rules diff --git a/src/yacc/module.mk b/src/yacc/module.mk deleted file mode 100644 index 214c6f5b1..000000000 --- a/src/yacc/module.mk +++ /dev/null @@ -1,10 +0,0 @@ -MODULE := src/yacc - -MODULE_OBJS := \ - src/yacc/YaccParser.o - -MODULE_DIRS += \ - src/yacc - -# Include common rules -include $(srcdir)/common.rules diff --git a/src/zlib/module.mk b/src/zlib/module.mk deleted file mode 100644 index fe03715a8..000000000 --- a/src/zlib/module.mk +++ /dev/null @@ -1,24 +0,0 @@ -MODULE := src/zlib - -MODULE_OBJS := \ - src/zlib/adler32.o \ - src/zlib/compress.o \ - src/zlib/crc32.o \ - src/zlib/gzclose.o \ - src/zlib/gzlib.o \ - src/zlib/gzread.o \ - src/zlib/gzwrite.o \ - src/zlib/uncompr.o \ - src/zlib/deflate.o \ - src/zlib/trees.o \ - src/zlib/zutil.o \ - src/zlib/inflate.o \ - src/zlib/infback.o \ - src/zlib/inftrees.o \ - src/zlib/inffast.o - -MODULE_DIRS += \ - src/zlib - -# Include common rules -include $(srcdir)/common.rules