make/lib/Lib-jdk.incubator.jpackage.gmk

*** 32,42 ****
      NAME := applauncher, \
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/incubator/jpackage/internal/resources, \
      SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libapplauncher, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
!     CFLAGS := $(CXXFLAGS_JDKLIB), \
      CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(LIBCXX), \
      LIBS_windows := user32.lib shell32.lib advapi32.lib ole32.lib, \
--- 32,42 ----
      NAME := applauncher, \
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/incubator/jpackage/internal/resources, \
      SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libapplauncher, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
!     CFLAGS := $(CXXFLAGS_JDKLIB) $(X_CFLAGS), \
      CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(LIBCXX), \
      LIBS_windows := user32.lib shell32.lib advapi32.lib ole32.lib, \