OpenJDK / bsd-port / jdk8 / jdk
changeset 13489:c8bb92cfa42d tip
Restore bsd specific iconv make flags lost in merge conflict.
| author | Kurt Miller <kurt@intricatesoftware.com> |
|---|---|
| date | Mon, 11 Feb 2019 09:23:48 -0500 |
| parents | 8eacda982ccf |
| children | |
| files | make/lib/Awt2dLibraries.gmk |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/lib/Awt2dLibraries.gmk Sun Feb 10 09:27:00 2019 -0800 +++ b/make/lib/Awt2dLibraries.gmk Mon Feb 11 09:23:48 2019 -0500 @@ -1185,6 +1185,11 @@ LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 + else ifeq ($(OPENJDK_TARGET_OS), bsd) + LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include + ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) + LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG + endif else ifeq ($(OPENJDK_TARGET_OS), windows) LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 else @@ -1204,6 +1209,8 @@ -framework Foundation \ -framework Cocoa \ -framework JavaNativeFoundation + else ifeq ($(OPENJDK_TARGET_OS), bsd) + LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread else ifeq ($(OPENJDK_TARGET_OS), windows) LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll else # .. all other Unixes can use X_LIBS