diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-24 16:32:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-24 17:37:45 +0200 |
| commit | ca629ad33233fd7813df5097063ad3ae6a1e3757 (patch) | |
| tree | 4ca759ce0380f4dfec2bbe87a38df084e9231523 | |
| parent | ed0f2c949692bb9096144c8d063b38207a6f5808 (diff) | |
vcl: rename WinResTarget target to match source file
makedepend relies on that
Change-Id: I6a166f65d25c2750c24bc7831d074c32f6524722
| -rw-r--r-- | vcl/Library_vcl.mk | 3 | ||||
| -rw-r--r-- | vcl/WinResTarget_vcl.mk | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 4b8596b0cda9..88cbfcf9be94 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -654,7 +654,8 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ winspool \ )) -$(eval $(call gb_Library_add_nativeres,vcl,vcl/src)) +$(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) + ifeq ($(COM),MSC) ifeq ($(USE_MINGW),) $(eval $(call gb_Library_add_ldflags,vcl,\ diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index cdd898dc2126..48daadd78020 100644 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -17,17 +17,17 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_WinResTarget_WinResTarget,vcl/src)) +$(eval $(call gb_WinResTarget_WinResTarget,vcl/salsrc)) -$(eval $(call gb_WinResTarget_set_include,vcl/src,\ +$(eval $(call gb_WinResTarget_set_include,vcl/salsrc,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ )) -$(eval $(call gb_WinResTarget_set_rcfile,vcl/src,\ +$(eval $(call gb_WinResTarget_set_rcfile,vcl/salsrc,\ vcl/win/source/src/salsrc \ )) -$(eval $(call gb_WinResTarget_add_dependencies,vcl/src,\ +$(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\ vcl/win/source/src/dtext.cur \ vcl/win/source/src/50.bmp \ vcl/win/source/src/copydata.cur \ |