Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
3c285e57
Commit
3c285e57
authored
Feb 13, 2015
by
Fabio Bas
Browse files
Fix compilation under win32; fix installation of lib under win32
parent
e8cb2607
Changes
2
Hide whitespace changes
Inline
Side-by-side
oracle/CMakeLists.txt
View file @
3c285e57
...
@@ -207,6 +207,12 @@ IF(WIN32)
...
@@ -207,6 +207,12 @@ IF(WIN32)
# these needs to be relative to CMAKE_INSTALL_PREFIX
# these needs to be relative to CMAKE_INSTALL_PREFIX
set
(
plugin_dest_dir Plugins
)
set
(
plugin_dest_dir Plugins
)
set
(
qtconf_dest_dir .
)
set
(
qtconf_dest_dir .
)
list
(
APPEND libSearchDirs
${
QT_LIBRARY_DIR
}
)
IF
(
ZLIB_FOUND
)
get_filename_component
(
ZLIB_DLL_DIR
"
${
ZLIB_INCLUDE_DIRS
}
/../bin/"
REALPATH
)
list
(
APPEND libSearchDirs
${
ZLIB_DLL_DIR
}
)
ENDIF
()
MESSAGE
(
STATUS
"Oracle: ZLIB dll found at
${
ZLIB_DLL_DIR
}
"
)
# qt4: codecs, iconengines, imageformats
# qt4: codecs, iconengines, imageformats
# qt5: iconengines, imageformats, platforms
# qt5: iconengines, imageformats, platforms
...
@@ -225,6 +231,6 @@ Translations = Resources/translations\")
...
@@ -225,6 +231,6 @@ Translations = Resources/translations\")
\"\$
{CMAKE_INSTALL_PREFIX}/
${
plugin_dest_dir
}
/*.dll
\"
)
\"\$
{CMAKE_INSTALL_PREFIX}/
${
plugin_dest_dir
}
/*.dll
\"
)
set(BU_CHMOD_BUNDLE_ITEMS ON)
set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities)
include(BundleUtilities)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/oracle.exe
\"
\"\$
{QTPLUGINS}
\"
\"
${
QT_LIBRARY_DIR
}
\"
)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/oracle.exe
\"
\"\$
{QTPLUGINS}
\"
\"
${
libSearchDirs
}
\"
)
"
COMPONENT Runtime
)
"
COMPONENT Runtime
)
endif
()
endif
()
\ No newline at end of file
oracle/src/zip/zipglobal.cpp
View file @
3c285e57
...
@@ -115,7 +115,7 @@ bool OSDAB_ZIP_MANGLE(setFileTimestamp)(const QString& fileName, const QDateTime
...
@@ -115,7 +115,7 @@ bool OSDAB_ZIP_MANGLE(setFileTimestamp)(const QString& fileName, const QDateTime
return
true
;
return
true
;
#ifdef Q_OS_WIN
#ifdef Q_OS_WIN
HANDLE
hFile
=
CreateFile
(
fileName
.
toStdWString
().
c_str
(),
HANDLE
hFile
=
CreateFile
W
(
fileName
.
toStdWString
().
c_str
(),
GENERIC_WRITE
,
FILE_SHARE_WRITE
,
0
,
OPEN_EXISTING
,
0
,
0
);
GENERIC_WRITE
,
FILE_SHARE_WRITE
,
0
,
OPEN_EXISTING
,
0
,
0
);
if
(
hFile
==
INVALID_HANDLE_VALUE
)
{
if
(
hFile
==
INVALID_HANDLE_VALUE
)
{
return
false
;
return
false
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment