diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9c98e22 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +changelog.txt eol=lf +readme.md eol=lf diff --git a/qtBuildSystem/Mu/Mu.pro b/qtBuildSystem/Mu/Mu.pro index a0554a0..43cc76f 100644 --- a/qtBuildSystem/Mu/Mu.pro +++ b/qtBuildSystem/Mu/Mu.pro @@ -24,17 +24,28 @@ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs depreca # ios { # QMAKE_INFO_PLIST = ios/Info.plist +# DEFINES += EMU_MULTITHREADED # } macx { CONFIG += sdk_no_version_check # using 10.14 SDK which Qt only unofficialy supports QMAKE_INFO_PLIST = macos/Info.plist + DEFINES += EMU_MULTITHREADED +} + +windows { + QMAKE_CFLAGS += -openmp + QMAKE_CXXFLAGS += -openmp + QMAKE_LFLAGS += -openmp + DEFINES += "_Pragma=__pragma" + DEFINES += EMU_MULTITHREADED } android { QMAKE_CFLAGS += -fopenmp QMAKE_CXXFLAGS += -fopenmp QMAKE_LFLAGS += -fopenmp + DEFINES += EMU_MULTITHREADED } CONFIG(debug, debug|release){ @@ -44,9 +55,8 @@ CONFIG(debug, debug|release){ # DEFINES += EMU_SANDBOX_LOG_APIS } -DEFINES += EMU_MULTITHREADED QMAKE_CFLAGS += -std=c99 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG += c++11 INCLUDEPATH += $$PWD/qt-common/include diff --git a/readme.md b/readme.md index 6156c2a..d86c9a5 100644 --- a/readme.md +++ b/readme.md @@ -76,6 +76,15 @@ Install prc-tools from the below link(self compiled or prepackaged vm) ./make.sh ## Running +#### Before Compiling On Windows +You must enable symlinks first: + + cd ./libretro-palmm515emu + git config core.symlinks true + +Then open GitHub Desktop and discard all changes to create the linked directorys. +The source files can now be located properly. + #### For Qt 1. Run once to create the directory tree 2. Copy "palmRoms/Palm m515/rom(selfDumped).bin" to "~/Mu" diff --git a/src/endianness.h b/src/endianness.h index e464e8b..93cb8b1 100644 --- a/src/endianness.h +++ b/src/endianness.h @@ -4,10 +4,6 @@ #include -#if defined(_MSC_VER) && _MSC_VER > 1200 -#define SWAP16 _byteswap_ushort -#define SWAP32 _byteswap_ulong -#else #define SWAP16(x) ((uint16_t)( \ (((uint16_t)(x) & 0x00ff) << 8) | \ (((uint16_t)(x) & 0xff00) >> 8) \ @@ -18,7 +14,6 @@ (((uint32_t)(x) & 0x00ff0000) >> 8) | \ (((uint32_t)(x) & 0xff000000) >> 24) \ )) -#endif #if defined(_MSC_VER) && _MSC_VER <= 1200 #define SWAP64(val) \