[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [necessitas-installer-framework/unstable] installerbuilder: win32 build fixes
From:       Ray Donnelly <mingw.android () laptop ! com>
Date:       2012-07-31 20:13:08
Message-ID: 20120731201308.9C588A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 0838897a869da61d55743bf716a066ee98a0749a by Ray Donnelly.
Committed on 31/07/2012 at 22:12.
Pushed by rdonnelly into branch 'unstable'.

win32 build fixes

M  +2    -0    installerbuilder/installerbase/installerbase.pro
M  +1    -1    installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/StreamObjects.cpp
 M  +1    -1    installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp


http://commits.kde.org/necessitas-installer-framework/0838897a869da61d55743bf716a066ee98a0749a


diff --git a/installerbuilder/installerbase/installerbase.pro \
b/installerbuilder/installerbase/installerbase.pro index 81c1a8a..ffe2e76 100644
--- a/installerbuilder/installerbase/installerbase.pro
+++ b/installerbuilder/installerbase/installerbase.pro
@@ -29,6 +29,8 @@ defineTest(testQmFiles) {
     return(true)
 }
 
+win32-g++: LIBS += mpr.lib
+
 if (testQmFiles()) {
 RESOURCES += installerbase.qrc
 }
diff --git a/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/StreamObjects.cpp \
b/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/StreamObjects.cpp \
                index 3c86c3a..dc5c2c0 100644
--- a/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/StreamObjects.cpp
                
+++ b/installerbuilder/libinstaller/3rdparty/7zip/win/CPP/7zip/Common/StreamObjects.cpp
 @@ -78,7 +78,7 @@ Byte *CDynBufSeqOutStream::GetBufPtrForWriting(size_t addSize)
 void CDynBufSeqOutStream::CopyToBuffer(CByteBuffer &dest) const
 {
   dest.SetCapacity(_size);
-  memcpy(dest, _buffer, _size);
+  memcpy(dest, (void*)_buffer, _size);
 }
 
 STDMETHODIMP CDynBufSeqOutStream::Write(const void *data, UInt32 size, UInt32 \
                *processedSize)
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp \
b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp index \
                6816315..2db58d4 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp
@@ -876,7 +876,7 @@ bool ExecuteOperation::performOperation()
                                      static_cast< ulong >(CW_USEDEFAULT), \
                static_cast< ulong >(CW_USEDEFAULT),
                                      0, 0, 0, STARTF_USESHOWWINDOW, SW_HIDE, 0, 0, \
0, 0, 0  };
-        success = CreateProcess(0, const_cast< wchar_t* >(static_cast< const \
wchar_t* >(arguments.utf16())), +        success = CreateProcess(0, const_cast< \
                wchar_t* >(reinterpret_cast< const wchar_t* >(arguments.utf16())),
                                 0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | \
CREATE_NEW_CONSOLE, 0,  0,
                                 &startupInfo, &pinfo);


[prev in list] [next in list] [prev in thread] [next in thread]