Skip to content
Snippets Groups Projects
Commit 6701b0c2 authored by psychocrypt's avatar psychocrypt Committed by GitHub
Browse files

Merge pull request #47 from fireice-uk/topic-re-add-uac-manifest

Re-add UAC manifest and WIN_UAC cmake option
parents c7c58243 1fc87d73
No related branches found
No related tags found
No related merge requests found
...@@ -413,6 +413,12 @@ set(LIBRARY_OUTPUT_PATH "bin") ...@@ -413,6 +413,12 @@ set(LIBRARY_OUTPUT_PATH "bin")
target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend) target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend)
option(WIN_UAC "Add UAC manifest on Windows" ON)
if(WIN_UAC AND CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set_property(TARGET xmr-stak PROPERTY LINK_FLAGS "/level='requireAdministrator' /uiAccess='false'")
endif()
################################################################################ ################################################################################
# Install # Install
################################################################################ ################################################################################
......
...@@ -44,6 +44,9 @@ After the configuration you need to compile the miner, follow the guide for your ...@@ -44,6 +44,9 @@ After the configuration you need to compile the miner, follow the guide for your
- there is no *http* interface available if option is disabled: `cmake .. -DMICROHTTPD_ENABLE=OFF` - there is no *http* interface available if option is disabled: `cmake .. -DMICROHTTPD_ENABLE=OFF`
- `OpenSSL_ENABLE` allow to disable/enable the dependency *OpenSSL* - `OpenSSL_ENABLE` allow to disable/enable the dependency *OpenSSL*
- it is not possible to connect to a *https* secured pool if option is disabled: `cmake .. -DOpenSSL_ENABLE=OFF` - it is not possible to connect to a *https* secured pool if option is disabled: `cmake .. -DOpenSSL_ENABLE=OFF`
- `WIN_UAC` will enable or disable the "Run As Administrator" prompt on Windows.
- UAC confirmation is needed to use large pages on Windows 7.
- On Windows 10 it is only needed once to set up the account to use them.
## CPU Build Options ## CPU Build Options
......
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
# include "xmrstak/http/httpd.hpp" # include "xmrstak/http/httpd.hpp"
#endif #endif
#ifdef _WIN32
# include "xmrstak/misc/uac.hpp"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string> #include <string>
...@@ -92,11 +88,6 @@ void help() ...@@ -92,11 +88,6 @@ void help()
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef _WIN32
if (!IsElevated() && SelfElevate(argv[0]))
return 0;
#endif
#ifndef CONF_NO_TLS #ifndef CONF_NO_TLS
SSL_library_init(); SSL_library_init();
SSL_load_error_strings(); SSL_load_error_strings();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment