diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 15:31:46 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
| commit | dc397aae70433c0086ef41f4dac5289fb07a9b19 (patch) | |
| tree | 3252bd411bd7a488c5af8640e37bb947900631df /jvmfwk | |
| parent | 80374355ab96fa73f2aee8971195faf3cf5985f5 (diff) | |
gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT:
add a new gb_LinkTarget_use_system_win32_libs to abstract different
linker options on MSVC and GCC.
Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/Library_jvmfwk.mk | 4 | ||||
| -rw-r--r-- | jvmfwk/Library_sunjavaplugin.mk | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 73a2e6bd5e5c..5051a2b9bb17 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -50,8 +50,8 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ $(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,jvmfwk,\ - advapi32 \ +$(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ + advapi32 \ )) endif diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index e25d993fac2d..61ff7bdfe5ac 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -62,9 +62,8 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ - advapi32 \ - uwinapi \ +$(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\ + advapi32 \ )) endif |