Buildsystem: Make core buildable under Windows again
- changed OpenSSL detection of headers around slightly - changed paths to MySQL-headers on Windows in a few files - removed precompiled header for scripts being built when building game - added requirement of building revision.h to be built before building shared - added some generic buildfixes (thanks zor) - use resource-files, allowing for icons to show up on windows --HG-- branch : trunk
This commit is contained in:
1 parent
8082363fc1
commit
9a8342abb7
11 files changed
+42
-34
No files matched your search
@@ -12,7 +12,7 @@
|
||||
|
||||
set(OPENSSL_FOUND 0)
|
||||
|
||||
if(WIN32)
|
||||
if( MSVC )
|
||||
if(PLATFORM MATCHES X64)
|
||||
set(TMP_OPENSSL_INCLUDE_DIR
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include"
|
||||
@@ -38,12 +38,12 @@
|
||||
NAMES
|
||||
openssl/ssl.h
|
||||
PATHS
|
||||
${TMP_OPENSSL_INCLUDE_DIR}
|
||||
/usr/include
|
||||
/usr/include/openssl
|
||||
/usr/local/include
|
||||
/usr/local/include/openssl
|
||||
/usr/local/openssl/include
|
||||
${TMP_OPENSSL_INCLUDE_DIR}
|
||||
DOC
|
||||
"Specify the directory containing openssl.h."
|
||||
)
|
||||
@@ -53,12 +53,12 @@
|
||||
ssleay32
|
||||
ssl
|
||||
PATHS
|
||||
${TMP_OPENSSL_LIBRARIES}
|
||||
/usr/lib
|
||||
/usr/lib/ssl
|
||||
/usr/local/lib
|
||||
/usr/local/lib/ssl
|
||||
/usr/local/ssl/lib
|
||||
${TMP_OPENSSL_LIBRARIES}
|
||||
DOC "Specify the OpenSSL library here."
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user