All-

I think we need to pull back one click on the diff tool, because these changes being reviewed are missing the enclosing

ifeq ($(PLATFORM), macosx)
     ...
endif

This was an existing bug, but it is material to the issue at hand. This needs a fresh look and some refactoring. Here is the code in make/sun/splashscreen/Makefile with Brad's recent diffs added. The 'ifeq ... macosx' block starting at line 86 will never be true because it is already part of an else... (see below)


% cat -n make/sun/splashscreen/Makefile
 [...]
    64  ifeq ($(PLATFORM), macosx)
    65    CFLAGS += -DWITH_MACOSX
    66
67 # CFLAGS and CPPFLAGS are added when linking as well, so we use VARIANT 68 # instead to specify that we're actually compiling objective-c code here
    69    CFLAGS_$(VARIANT)/java_awt_SplashScreen.o = -x objective-c
    70    CFLAGS_$(VARIANT)/splashscreen_gfx_impl.o = -x objective-c
    71    CFLAGS_$(VARIANT)/splashscreen_gif.o = -x objective-c
    72    CFLAGS_$(VARIANT)/splashscreen_impl.o = -x objective-c
    73    CFLAGS_$(VARIANT)/splashscreen_jpeg.o = -x objective-c
    74    CFLAGS_$(VARIANT)/splashscreen_png.o = -x objective-c
    75    CFLAGS_$(VARIANT)/splashscreen_sys.o = -x objective-c
    76
77 OTHER_CFLAGS += -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks 78 CPPFLAGS += -I/System/Library/Frameworks/AppKit.framework/Versions/C/Headers
    79    OTHER_LDLIBS += $(LIBM) -lpthread -liconv -losxapp \
    80                                    -framework ApplicationServices \
    81                                    -framework Foundation \
    82                                    -framework Cocoa \
    83                                    -framework JavaNativeFoundation
    84  else ifneq ($(PLATFORM), windows)
    85    CFLAGS += -DWITH_X11
    86    ifeq ($(PLATFORM), macosx))
    87      OTHER_LDLIBS += -liconv
    88      CPPFLAGS += -I$(OPENWIN_HOME)/include \
    89                  -I$(OPENWIN_HOME)/include/X11/extensions \
    90                  -I$(SHARE_SRC)/native/sun/awt/giflib
    91      OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread
    92    else
93 CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions \
    94                  -I$(SHARE_SRC)/native/sun/awt/giflib
    95      OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
    96    endif
    97  else # PLATFORM
    98    CFLAGS += -DWITH_WIN32
    99    CPPFLAGS += -I$(SHARE_SRC)/native/sun/awt/giflib
100 OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll
   101  #$(JVMLIB) $(OBJDIR)/../../jpeg/$(OBJDIRNAME)/jpeg$(SUFFIX).lib
   102  endif # PLATFORM

Reply via email to