Changeset 74 for trunk/openjdk/jdk/make/launchers/Makefile.launcher

Timestamp:

Jul 21, 2010, 9:16:25 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Adopted a huge bunch of makefiles to OS/2 (will be tested as they get used).

File:

• trunk/openjdk/jdk/make/launchers/Makefile.launcher (modified) (2 diffs)

trunk/openjdk/jdk/make/launchers/Makefile.launcher

@@ -142 +142 @@
   JCONSOLE_CLASSPATH = { "/lib/jconsole.jar", "/lib/tools.jar", "/classes" }
   OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(JCONSOLE_CLASSPATH)'
-  ifeq ($(PLATFORM), windows)
+  ifeq ($(filter-out windows os2, $(PLATFORM)),)
     OTHER_CPPFLAGS += -DJAVAW
     LDLIBS_COMMON  += user32.lib
@@ -151 +151 @@
 # GUI tools
 ifeq ($(GUI_TOOL),true)
-  ifneq ($(PLATFORM), windows)
+  ifeq ($(filter-out windows os2, $(PLATFORM)),)
     # Anything with a GUI needs X11 to be linked in.
     OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11