mirror of
https://github.com/visualboyadvance-m/visualboyadvance-m
synced 2025-10-05 15:42:52 +02:00
Fix online updates header
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -17,3 +17,6 @@ compile_commands.json
|
|||||||
|
|
||||||
# mac finder crap
|
# mac finder crap
|
||||||
*.DS_Store
|
*.DS_Store
|
||||||
|
|
||||||
|
# online updates header
|
||||||
|
src/wx/winsparkle-path.h
|
||||||
|
@@ -770,7 +770,7 @@ if(APPLE)
|
|||||||
set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
|
set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
|
||||||
endif()
|
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)
|
if(NOT DEFINED WINSPARKLE_BIN_RELEASE_DIR)
|
||||||
set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/win32-deps/WinSparkle-0.9.1)
|
set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/win32-deps/WinSparkle-0.9.1)
|
||||||
endif()
|
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.cpp
|
||||||
autoupdater/wxmsw/winsparkle-wrapper.h)
|
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()
|
endif()
|
||||||
|
|
||||||
if(APPLE AND ENABLE_ONLINEUPDATES)
|
if(APPLE AND ENABLE_ONLINEUPDATES)
|
||||||
|
@@ -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"
|
WINSPARKLE_DLL_RC RCDATA "../../win32-deps/WinSparkle-0.9.1/mingw/i686/WinSparkle.dll"
|
||||||
#elif defined(__x86_64__)
|
#elif defined(__x86_64__)
|
||||||
WINSPARKLE_DLL_RC RCDATA "../../win32-deps/WinSparkle-0.9.1/mingw/x86_64/WinSparkle.dll"
|
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
|
#else
|
||||||
#include "winsparkle-path.h"
|
#include "winsparkle-path.h"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user