Changeset 377 for trunk/icedtea-web/plugin/icedteanp/Makefile.kmk

Timestamp:

Jun 5, 2012, 9:51:10 AM (13 years ago)

Author:

dmik

Message:

icedtea-web: Wrap OS/2 HWND in WinOS2 HWND.

Java expects WinOS2 HWNDs while the plugin gets the OS/2 HWND
from the browser.

This commit also includes some source file reorganization (for clarity).

File:

• trunk/icedtea-web/plugin/icedteanp/Makefile.kmk (modified) (3 diffs)

trunk/icedtea-web/plugin/icedteanp/Makefile.kmk

@@ -14 +14 @@
 DLLS               += npicedt
 npicedt_TEMPLATE    = Cxx
-npicedt_INCS        = $(PATH_ROOT)/extra $(PATH_MOZILLA_INCS) $(PATH_GLIB_INCS)
+npicedt_INCS        = $(PATH_CURRENT) $(PATH_MOZILLA_INCS) $(PATH_GLIB_INCS)
+npicedt_INCS.os2    = os2
 npicedt_DEFS        = MOZILLA_VERSION_COLLAPSED=$(MOZILLA_VERSION_COLLAPSED) \
                       DETECT_DATA_DIR=$(DETECT_DATA_DIR) \
@@ -28 +29 @@
                       -DPLUGIN_BOOTCLASSPATH="$(PLUGIN_BOOTCLASSPATH)"
 npicedt_LIBS        = $(PATH_GLIB_LIBS) pthread
+npicedt_LIBS.os2    = kernel32.lib user32.lib
 npicedt_LIBPATH     = $(PATH_GLIB_LIBPATH)
+npicedt_LIBPATH.os2 = kernel32.lib user32.lib $(SDK_ODIN_LIBPATH)
 
 npicedt_SOURCES     = \
@@ -35 +38 @@
     IcedTeaJavaRequestProcessor.cc \
     IcedTeaPluginRequestProcessor.cc \
-    IcedTeaPluginUtils.cc \
-    $(PATH_ROOT)/extra/OS.cc \
+    IcedTeaPluginUtils.cc
+
+npicedt_SOURCES.os2 = \
+    os2/OS_OS2.cc \
+    os2/OS_OS2_WinOS2.cc \
     $(PATH_ROOT)/plugin_os2.def
+
+os2/OS_OS2_WinOS2.cc_SDKS.os2 += ODIN
 
 PLUGIN_RC           = $(npicedt_0_OUTDIR)/plugin_os2.rc