diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2011-03-23 17:32:53 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2011-03-23 17:32:53 +0100 |
commit | 4617694b3fd830c8560f8d75d5f6afca618a8d65 (patch) | |
tree | 6ad24730d0feee74e8929654d0cc7b94424d6b80 /vcl | |
parent | d47d21cb19e3f33b3b9c76aef16fd89802a52c11 (diff) |
vcl2gnumake: #i116588# add: windows native resource files, cleanup (thanks hjs !)
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Library_desktop_detector.mk | 2 | ||||
-rwxr-xr-x | vcl/Library_vcl.mk | 9 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/Library_vclplug_gen.mk | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/Library_vclplug_gtk.mk | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/Library_vclplug_kde.mk | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/Library_vclplug_kde4.mk | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/Library_vclplug_svp.mk | 4 | ||||
-rw-r--r-- | vcl/Module_vcl.mk | 7 | ||||
-rwxr-xr-x | vcl/StaticLibrary_vclmain.mk | 10 | ||||
-rwxr-xr-x | vcl/WinResTarget_vcl.mk | 123 | ||||
-rwxr-xr-x | vcl/win/source/gdi/wntgdi.cxx | 3 |
11 files changed, 148 insertions, 26 deletions
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index f98be027fa1d..49151cb19ff5 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,desktop_detector)) -$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) +#$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) $(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 98f84e13600b..445059ec4a9d 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -37,8 +37,6 @@ endif $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) -#$(eval $(call gb_Library_add_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) - $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ @@ -236,7 +234,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/window/salobj \ )) -### FIXME: need to link windows resources to vcl dll +$(eval $(call gb_Library_add_nativeres,vcl,src)) + endif $(eval $(call gb_Library_add_cobjects,vcl,\ @@ -469,6 +468,10 @@ $(eval $(call gb_Library_set_ldflags,vcl,\ endif ifeq ($(OS),WNT) +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ + /ENTRY:LibMain@12 \ +)) $(eval $(call gb_Library_add_linked_libs,vcl,\ advapi32 \ gdi32 \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 7d534aa211a3..bba48e0d65ba 100644..100755 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,vclplug_gen)) -$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) - -$(eval $(call gb_Library_add_precompiled_header,vclplug_gen,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) - $(eval $(call gb_Library_set_include,vclplug_gen,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index d0df791bad7d..129ef1060272 100644..100755 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,vclplug_gtk)) -$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) - -$(eval $(call gb_Library_add_precompiled_header,vclplug_gtk,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) - $(eval $(call gb_Library_set_include,vclplug_gtk,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 560898d94ed7..a3fc45513707 100644..100755 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,vclplug_kde)) -$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) - -$(eval $(call gb_Library_add_precompiled_header,vclplug_kde,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) - $(eval $(call gb_Library_set_include,vclplug_kde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index ad1c5530ce79..30fc756b4a35 100644..100755 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,vclplug_kde4)) -$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) - -$(eval $(call gb_Library_add_precompiled_header,vclplug_kde4,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) - $(eval $(call gb_Library_set_include,vclplug_kde4,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 845b0c93d320..1289c6b53a83 100644..100755 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,vclplug_svp)) -$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) - -$(eval $(call gb_Library_add_precompiled_header,vclplug_svp,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) - $(eval $(call gb_Library_set_include,vclplug_svp,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index ff35aadd574c..929f60988bb1 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -30,8 +30,8 @@ $(eval $(call gb_Module_Module,vcl)) $(eval $(call gb_Module_add_targets,vcl,\ Library_vcl \ - Package_inc \ StaticLibrary_vclmain \ + Package_inc \ AllLangResTarget_vcl \ )) @@ -65,5 +65,10 @@ $(eval $(call gb_Module_add_targets,vcl,\ )) endif +ifeq ($(GUIBASE),WIN) +$(eval $(call gb_Module_add_targets,vcl,\ + WinResTarget_vcl \ +)) +endif # vim: set noet sw=4 ts=4: diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index 9e6275f345d5..ccf800b38ce6 100755 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -27,7 +27,15 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) -$(eval $(call gb_StaticLibrary_add_package_headers,vclmain,vcl_inc)) +$(eval $(call gb_StaticLibrary_set_include,vclmain,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) $(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\ vcl/source/salmain/salmain \ diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk new file mode 100755 index 000000000000..68fe30c0826c --- /dev/null +++ b/vcl/WinResTarget_vcl.mk @@ -0,0 +1,123 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_WinResTarget_WinResTarget,vcl/src)) + +$(eval $(call gb_WinResTarget_set_include,vcl/src,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_WinResTarget_add_file,vcl/src,\ + vcl/win/source/src/salsrc \ +)) +$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ + vcl/win/source/src/dtext.cur \ + vcl/win/source/src/50.bmp \ + vcl/win/source/src/copydata.cur \ + vcl/win/source/src/dpie.cur \ + vcl/win/source/src/movedata.cur \ + vcl/win/source/src/rotate.cur \ + vcl/win/source/src/50.png \ + vcl/win/source/src/copydlnk.cur \ + vcl/win/source/src/dpolygon.cur \ + vcl/win/source/src/movedlnk.cur \ + vcl/win/source/src/salsrc.rc \ + vcl/win/source/src/airbrush.cur \ + vcl/win/source/src/copyf.cur \ + vcl/win/source/src/drect.cur \ + vcl/win/source/src/movef.cur \ + vcl/win/source/src/sd.ico \ + vcl/win/source/src/ase.cur \ + vcl/win/source/src/copyf2.cur \ + vcl/win/source/src/dtext.cur \ + vcl/win/source/src/movef2.cur \ + vcl/win/source/src/tblsele.cur \ + vcl/win/source/src/asn.cur \ + vcl/win/source/src/copyflnk.cur \ + vcl/win/source/src/fill.cur \ + vcl/win/source/src/moveflnk.cur \ + vcl/win/source/src/tblsels.cur \ + vcl/win/source/src/asne.cur \ + vcl/win/source/src/crook.cur \ + vcl/win/source/src/hand.cur \ + vcl/win/source/src/movept.cur \ + vcl/win/source/src/tblselse.cur \ + vcl/win/source/src/asns.cur \ + vcl/win/source/src/crop.cur \ + vcl/win/source/src/help.cur \ + vcl/win/source/src/neswsize.cur \ + vcl/win/source/src/tblselsw.cur \ + vcl/win/source/src/asnswe.cur \ + vcl/win/source/src/cross.cur \ + vcl/win/source/src/hshear.cur \ + vcl/win/source/src/notallow.cur \ + vcl/win/source/src/tblselw.cur \ + vcl/win/source/src/asnw.cur \ + vcl/win/source/src/darc.cur \ + vcl/win/source/src/hsize.cur \ + vcl/win/source/src/nullptr.cur \ + vcl/win/source/src/timemove.cur \ + vcl/win/source/src/ass.cur \ + vcl/win/source/src/dbezier.cur \ + vcl/win/source/src/hsizebar.cur \ + vcl/win/source/src/nwsesize.cur \ + vcl/win/source/src/timesize.cur \ + vcl/win/source/src/asse.cur \ + vcl/win/source/src/dcapt.cur \ + vcl/win/source/src/hsplit.cur \ + vcl/win/source/src/pen.cur \ + vcl/win/source/src/vshear.cur \ + vcl/win/source/src/assw.cur \ + vcl/win/source/src/dcirccut.cur \ + vcl/win/source/src/linkdata.cur \ + vcl/win/source/src/pivotcol.cur \ + vcl/win/source/src/vsize.cur \ + vcl/win/source/src/asw.cur \ + vcl/win/source/src/dconnect.cur \ + vcl/win/source/src/linkf.cur \ + vcl/win/source/src/pivotdel.cur \ + vcl/win/source/src/vsizebar.cur \ + vcl/win/source/src/aswe.cur \ + vcl/win/source/src/dellipse.cur \ + vcl/win/source/src/magnify.cur \ + vcl/win/source/src/pivotfld.cur \ + vcl/win/source/src/vsplit.cur \ + vcl/win/source/src/chain.cur \ + vcl/win/source/src/detectiv.cur \ + vcl/win/source/src/mirror.cur \ + vcl/win/source/src/pivotrow.cur \ + vcl/win/source/src/vtext.cur \ + vcl/win/source/src/chainnot.cur \ + vcl/win/source/src/dfree.cur \ + vcl/win/source/src/move.cur \ + vcl/win/source/src/pntbrsh.cur \ + vcl/win/source/src/chart.cur \ + vcl/win/source/src/dline.cur \ + vcl/win/source/src/movebw.cur \ + vcl/win/source/src/refhand.cur \ +)) diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx index 2f6d73a83ec6..eb53fb4d8699 100755 --- a/vcl/win/source/gdi/wntgdi.cxx +++ b/vcl/win/source/gdi/wntgdi.cxx @@ -25,6 +25,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_vcl.hxx" + #if defined _MSC_VER #pragma warning(push, 1) #endif |