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/Library_vcl.mk | |
| parent | d47d21cb19e3f33b3b9c76aef16fd89802a52c11 (diff) | |
vcl2gnumake: #i116588# add: windows native resource files, cleanup (thanks hjs !)
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rwxr-xr-x | vcl/Library_vcl.mk | 9 |
1 files changed, 6 insertions, 3 deletions
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 \ |