diff --git a/RetroFE/Source/CMakeLists.txt b/RetroFE/Source/CMakeLists.txt index 7d459b3..224d20f 100644 --- a/RetroFE/Source/CMakeLists.txt +++ b/RetroFE/Source/CMakeLists.txt @@ -14,11 +14,18 @@ set(SQLITE3_ROOT "${RETROFE_THIRD_PARTY_DIR}/sqlite3") set(RAPIDXML_ROOT "${RETROFE_THIRD_PARTY_DIR}/rapidxml-1.13") if(WIN32) - set(CMAKE_PREFIX_PATH "${RETROFE_DIR}/ThirdParty/win32") +if(MSVC) set(SDL2_ROOT "${RETROFE_THIRD_PARTY_DIR}/SDL2-2.0.3") set(SDL2_IMAGE_ROOT "${RETROFE_THIRD_PARTY_DIR}/SDL2_image-2.0.0") set(SDL2_MIXER_ROOT "${RETROFE_THIRD_PARTY_DIR}/SDL2_mixer-2.0.0") set(SDL2_TTF_ROOT "${RETROFE_THIRD_PARTY_DIR}/SDL2_ttf-2.0.12") +elseif(MINGW) + set(SDL2_ROOT "${RETROFE_THIRD_PARTY_DIR}/SDL2-2.0.3-mingw/i686-w64-mingw32") + set(SDL2_IMAGE_ROOT "${RETROFE_THIRD_PARTY_DIR}/SDL2_image-2.0.0-mingw/i686-w64-mingw32") + set(SDL2_MIXER_ROOT "${RETROFE_THIRD_PARTY_DIR}/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32") + set(SDL2_TTF_ROOT "${RETROFE_THIRD_PARTY_DIR}/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32") +endif() + set(ZLIB_ROOT "${RETROFE_THIRD_PARTY_DIR}/zlib128-dll") set(GSTREAMER_ROOT "C:/gstreamer/1.0/x86" CACHE STRING "location of where your gstreamer include and lib folders reside") @@ -178,7 +185,7 @@ add_executable(retrofe ${RETROFE_SOURCES} ${RETROFE_HEADERS}) target_link_libraries(retrofe ${RETROFE_LIBRARIES}) set_target_properties(retrofe PROPERTIES LINKER_LANGUAGE CXX) if(MINGW) - set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -mwindows") + set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -lmingw32 -mwindows") endif() add_definitions(-DRETROFE_VERSION_MAJOR=${VERSION_MAJOR}) diff --git a/RetroFE/ThirdParty/SDL2-2.0.3-mingw/i686-w64-mingw32/bin/SDL2.dll b/RetroFE/ThirdParty/SDL2-2.0.3-mingw/i686-w64-mingw32/bin/SDL2.dll new file mode 100644 index 0000000..18d707f Binary files /dev/null and b/RetroFE/ThirdParty/SDL2-2.0.3-mingw/i686-w64-mingw32/bin/SDL2.dll differ diff --git a/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/SDL2_image.dll b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/SDL2_image.dll new file mode 100644 index 0000000..6bad4d2 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/SDL2_image.dll differ diff --git a/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libjpeg-9.dll b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libjpeg-9.dll new file mode 100644 index 0000000..bebc3d2 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libjpeg-9.dll differ diff --git a/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libpng16-16.dll b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libpng16-16.dll new file mode 100644 index 0000000..e0cdc5c Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libpng16-16.dll differ diff --git a/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libtiff-5.dll b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libtiff-5.dll new file mode 100644 index 0000000..76cbe33 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libtiff-5.dll differ diff --git a/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libwebp-4.dll b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libwebp-4.dll new file mode 100644 index 0000000..e34f1b8 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/libwebp-4.dll differ diff --git a/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/zlib1.dll b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/zlib1.dll new file mode 100644 index 0000000..db286b1 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_image-2.0.0-mingw/i686-w64-mingw32/bin/zlib1.dll differ diff --git a/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/SDL2_mixer.dll b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/SDL2_mixer.dll new file mode 100644 index 0000000..aa6d199 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/SDL2_mixer.dll differ diff --git a/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libFLAC-8.dll b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libFLAC-8.dll new file mode 100644 index 0000000..170f8e7 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libFLAC-8.dll differ diff --git a/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libmodplug-1.dll b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libmodplug-1.dll new file mode 100644 index 0000000..84f384d Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libmodplug-1.dll differ diff --git a/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libogg-0.dll b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libogg-0.dll new file mode 100644 index 0000000..74d2181 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libogg-0.dll differ diff --git a/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libvorbis-0.dll b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libvorbis-0.dll new file mode 100644 index 0000000..3696b07 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libvorbis-0.dll differ diff --git a/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libvorbisfile-3.dll b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libvorbisfile-3.dll new file mode 100644 index 0000000..7b4585a Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/libvorbisfile-3.dll differ diff --git a/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/smpeg2.dll b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/smpeg2.dll new file mode 100644 index 0000000..73b30eb Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_mixer-2.0.0-mingw/i686-w64-mingw32/bin/smpeg2.dll differ diff --git a/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/SDL2_ttf.dll b/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/SDL2_ttf.dll new file mode 100644 index 0000000..24ff416 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/SDL2_ttf.dll differ diff --git a/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/libfreetype-6.dll b/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/libfreetype-6.dll new file mode 100644 index 0000000..72a80da Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/libfreetype-6.dll differ diff --git a/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/zlib1.dll b/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/zlib1.dll new file mode 100644 index 0000000..2a50a90 Binary files /dev/null and b/RetroFE/ThirdParty/SDL2_ttf-2.0.12-mingw/i686-w64-mingw32/bin/zlib1.dll differ