diff --git a/.gitignore b/.gitignore index afde9293..addf38a9 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ compile_commands.json # mac finder crap *.DS_Store + +# online updates header +src/wx/winsparkle-path.h diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 976c6c0d..ea26ecdc 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -770,7 +770,7 @@ if(APPLE) set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks") endif() -if(WIN32 AND (X86_64 OR ARM64 OR X86_32) AND ENABLE_ONLINEUPDATES) +if(WIN32 AND (X86_64 OR ARM64 OR X86) AND ENABLE_ONLINEUPDATES) if(NOT DEFINED WINSPARKLE_BIN_RELEASE_DIR) set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/win32-deps/WinSparkle-0.9.1) endif() @@ -798,7 +798,7 @@ if(WIN32 AND (X86_64 OR ARM64 OR X86_32) AND ENABLE_ONLINEUPDATES) autoupdater/wxmsw/winsparkle-wrapper.cpp autoupdater/wxmsw/winsparkle-wrapper.h) - configure_file(autoupdater/wxmsw/winsparkle-path.h.in ${CMAKE_BINARY_DIR}/winsparkle-path.h) + configure_file(autoupdater/wxmsw/winsparkle-path.h.in ${CMAKE_SOURCE_DIR}/src/wx/winsparkle-path.h) endif() if(APPLE AND ENABLE_ONLINEUPDATES) diff --git a/src/wx/wxvbam.rc b/src/wx/wxvbam.rc index f3153315..e87b013d 100644 --- a/src/wx/wxvbam.rc +++ b/src/wx/wxvbam.rc @@ -23,12 +23,6 @@ AAAAA_MAINICON ICON "icons/visualboyadvance-m.ico" WINSPARKLE_DLL_RC RCDATA "../../win32-deps/WinSparkle-0.9.1/mingw/i686/WinSparkle.dll" #elif defined(__x86_64__) WINSPARKLE_DLL_RC RCDATA "../../win32-deps/WinSparkle-0.9.1/mingw/x86_64/WinSparkle.dll" -#elif defined(_M_AMD64) -WINSPARKLE_DLL_RC RCDATA "../../win32-deps/WinSparkle-0.9.1/X64/Release/WinSparkle.dll" -#elif defined(_M_ARM64) -WINSPARKLE_DLL_RC RCDATA "../../win32-deps/WinSparkle-0.9.1/ARM64/Release/WinSparkle.dll" -#elif defined(_M_IX86) -WINSPARKLE_DLL_RC RCDATA "../../win32-deps/WinSparkle-0.9.1/Release/WinSparkle.dll" #else #include "winsparkle-path.h"