[Libreoffice-commits] .: 2 commits - shell/inc shell/prj shell/source
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jun 24 06:45:00 PDT 2011
shell/inc/internal/thumbviewer.hxx | 2 +
shell/prj/build.lst | 2 -
shell/prj/d.lst | 1
shell/source/all/makefile.mk | 4 ++
shell/source/all/ooofilereader/makefile.mk | 4 ++
shell/source/tools/lngconvex/lngconvex.cxx | 23 +++++++++++-
shell/source/win32/shlxthandler/columninfo/makefile.mk | 4 ++
shell/source/win32/shlxthandler/infotips/makefile.mk | 4 ++
shell/source/win32/shlxthandler/makefile.mk | 8 ++++
shell/source/win32/shlxthandler/ooofilt/makefile.mk | 4 ++
shell/source/win32/shlxthandler/prophdl/makefile.mk | 4 ++
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx | 2 -
shell/source/win32/shlxthandler/res/makefile.mk | 6 ++-
shell/source/win32/shlxthandler/thumbviewer/makefile.mk | 3 +
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 4 ++
shell/source/win32/shlxthandler/util/makefile.mk | 4 ++
16 files changed, 74 insertions(+), 5 deletions(-)
New commits:
commit 87c8ca5abbbaea4a6271ca7f00610bc1961ebfae
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 24 16:39:08 2011 +0300
Do build and deliver lngconvex on Unix, too
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index dae761c..fb233e2 100644
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -10,7 +10,7 @@ sl shell\source\cmdmail nmake - u sl_cmdmail sl
sl shell\source\cmdmail nmake - p sl_cmdmail sl_inc NULL
sl shell\source\all nmake - all sl_all sl_inc NULL
sl shell\source\unix\sysshell nmake - u sl_unix_sysshell sl_all sl_inc NULL
-sl shell\source\tools\lngconvex nmake - w sl_win32_lngconv sl_inc NULL
+sl shell\source\tools\lngconvex nmake - all sl_win32_lngconv sl_inc NULL
sl shell\source\tools\regsvrex nmake - w sl_win32_regsvrex sl_inc NULL
sl shell\source\all\zipfile nmake - w sl_all_zipfile sl_inc NULL
sl shell\source\all\zipfile nmake - p sl_all_zipfile sl_inc NULL
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index 679b34c..62dfa80 100644
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
@@ -19,6 +19,7 @@
..\%__SRC%\bin\gnome-open-url.bin %_DEST%\bin\gnome-open-url.bin
..\%__SRC%\bin\senddoc %_DEST%\bin\senddoc
..\%__SRC%\bin\uri-encode %_DEST%\bin\uri-encode
+..\%__SRC%\bin\lngconvex %_DEST%\bin\lngconvex
..\%__SRC%\misc\*.xml %_DEST%\xml\*.xml
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index c975b30..1c58c1d 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -33,6 +33,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
+#ifdef WNT
#include <tools/presys.h>
#if defined _MSC_VER
#pragma warning(push, 1)
@@ -42,6 +43,15 @@
#pragma warning(pop)
#endif
#include <tools/postsys.h>
+#else
+// From MinGW
+typedef unsigned short WORD;
+#define PRIMARYLANGID(lgid) ((WORD)(lgid) & 0x3ff)
+#define SUBLANGID(lgid) ((WORD)(lgid) >> 10)
+#define LANG_SPANISH 0x0a
+#define SUBLANG_NEUTRAL 0x00
+#define SUBLANG_SPANISH 0x01
+#endif
#define VCL_NEED_BASETSD
@@ -63,6 +73,10 @@
#include <algorithm>
#include <string>
+#ifndef WNT
+#include <cstring>
+#endif
+
namespace /* private */
{
@@ -469,13 +483,20 @@ void start_language_section(
( subLangID == SUBLANG_SPANISH ) )
subLangID = SUBLANG_NEUTRAL;
+#ifdef WNT
_itoa(primLangID, buff, 16);
+#else
+ sprintf(buff, "%x", primLangID);
+#endif
lang_section += std::string("0x") + std::string(buff);
lang_section += std::string(" , ");
+#ifdef WNT
_itoa(subLangID, buff, 16);
-
+#else
+ sprintf(buff, "%x", subLangID);
+#endif
lang_section += std::string("0x") + std::string(buff);
ostream_iter = lang_section;
}
commit 620a7ed9f89e3586adbf8e54800b46f966b2d020
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 24 16:41:19 2011 +0300
Attempt to make this build with MinGW
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx
index c33b6cc..b52839f 100644
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/internal/thumbviewer.hxx
@@ -40,7 +40,9 @@
using std::min;
using std::max;
#endif
+#ifndef DONT_HAVE_GDIPLUS
#include <gdiplus.h>
+#endif
#if defined _MSC_VER
#pragma warning(pop)
#endif
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk
index 6c07f70..ffab537 100755
--- a/shell/source/all/makefile.mk
+++ b/shell/source/all/makefile.mk
@@ -38,12 +38,16 @@ ENABLE_EXCEPTIONS=TRUE
.IF "$(GUI)" == "WNT"
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS+=-D_WIN32_IE=0x501
.IF "$(BUILD_X64)"!=""
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS_X64+=-D_WIN32_IE=0x501
.ENDIF # "$(BUILD_X64)"!=""
.ENDIF
diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk
index a889897..90f0429 100755
--- a/shell/source/all/ooofilereader/makefile.mk
+++ b/shell/source/all/ooofilereader/makefile.mk
@@ -37,10 +37,14 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS+=-D_WIN32_IE=0x501
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS_X64+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk
index 29ebbbb..ceefe93 100755
--- a/shell/source/win32/shlxthandler/columninfo/makefile.mk
+++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk
@@ -37,7 +37,9 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
@@ -46,7 +48,9 @@ SLOFILES=$(SLO)$/columninfo.obj
.IF "$(BUILD_X64)"!=""
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS_X64+=-D_WIN32_IE=0x501
SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.ENDIF # "$(BUILD_X64)"!=""
diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk
index 459f08c..9daeafd 100755
--- a/shell/source/win32/shlxthandler/infotips/makefile.mk
+++ b/shell/source/win32/shlxthandler/infotips/makefile.mk
@@ -37,7 +37,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
@@ -46,7 +48,9 @@ SLOFILES=$(SLO)$/$(TARGET).obj
.IF "$(BUILD_X64)"!=""
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS_X64+=-D_WIN32_IE=0x501
SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.ENDIF # "$(BUILD_X64)"!=""
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index 5e9b78a..c8518f0 100755
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -45,7 +45,13 @@ UWINAPILIB =
UWINAPILIB_X64 =
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
+.IF "$(COM)" == "GCC"
+CDEFS+=-DDONT_HAVE_GDIPLUS
+.ENDIF
+
CDEFS+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
@@ -104,7 +110,9 @@ DEF1EXPORTFILE=exports.dxp
.IF "$(BUILD_X64)"!=""
# -------------------- x64 -----------------------
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS_X64+=-D_WIN32_IE=0x501
SLOFILES_X64= \
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index a2ee326..92111c6 100755
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -41,7 +41,9 @@ UWINAPILIB=
.INCLUDE : settings.mk
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
@@ -90,7 +92,9 @@ DEF1EXPORTFILE=exports.dxp
.IF "$(BUILD_X64)"!=""
#---------------------------- x64 -------------------------
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS_X64+=-D_WIN32_IE=0x501
USE_DEFFILE_X64=TRUE
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
index 7900d14..b5195ca 100755
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -44,7 +44,9 @@ UWINAPILIB =
UWINAPILIB_X64 =
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100
+.ENDIF
CDEFS+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
@@ -96,7 +98,9 @@ DEF1EXPORTFILE=exports.dxp
# -------------------- x64 -----------------------
.IF "$(BUILD_X64)"!=""
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS_X64+=-D_WIN32_IE=0x501
SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 7598545..842f337 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -32,7 +32,7 @@
#include <osl/diagnose.h>
#include "internal/global.hxx"
-#include "internal/PropertyHdl.hxx"
+#include "internal/propertyhdl.hxx"
#include "internal/fileextensions.hxx"
#include "internal/metainforeader.hxx"
#include "internal/utilities.hxx"
diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk
index ec05290..fc2bcbd 100755
--- a/shell/source/win32/shlxthandler/res/makefile.mk
+++ b/shell/source/win32/shlxthandler/res/makefile.mk
@@ -63,10 +63,12 @@ $(RES)$/x64$/$(TARGET).res : $(RES)$/$(TARGET).res
.INCLUDE : tg_wntx64.mk
-
# Generate the native Windows resource file
# using lngconvex.exe
$(RCFILES) : $(ULFDIR)$/shlxthdl.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
+.IF "$(COM)" == "MSC"
$(subst,$(SOLARBINDIR)$/lngconvex,$(BIN)$/lngconvex $(LNGCONVEX)) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
-
+.ELSE
+ $(LNGCONVEX) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+.ENDIF
diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
index fddea0d..ed90b9c 100755
--- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
+++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
@@ -37,6 +37,9 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CDEFS+=-D_WIN32_IE=0x501
+.IF "$(COM)" == "GCC"
+CDEFS+=-DDONT_HAVE_GDIPLUS
+.ENDIF
# --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index afc6bfe..65d0f8c 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#ifndef DONT_HAVE_GDIPLUS
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
@@ -529,4 +531,6 @@ Gdiplus::Rect CThumbviewer::CalcScaledAspectRatio(Gdiplus::Rect src, Gdiplus::Re
return result;
}
+#endif // DONT_HAVE_GDIPLUS
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk
index 1d47624..dff0fa9 100755
--- a/shell/source/win32/shlxthandler/util/makefile.mk
+++ b/shell/source/win32/shlxthandler/util/makefile.mk
@@ -36,11 +36,15 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS+=-D_WIN32_IE=0x501
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
CDEFS_X64+=-D_WIN32_IE=0x501
# --- Files --------------------------------------------------------
More information about the Libreoffice-commits
mailing list