makefiles/CompileNativeLibraries.gmk

Print this page

        

@@ -21,11 +21,11 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
 
-defalt: all
+default: all
 
 include $(SPEC)
 include MakeBase.gmk
 include NativeCompilation.gmk
 

@@ -2476,15 +2476,18 @@
                                   -framework ApplicationServices \
                                   -framework Foundation \
                                   -framework Cocoa \
                                   -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
                                   -framework JavaNativeFoundation
-else ifneq ($(OPENJDK_TARGET_OS), windows)
-        LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
-else # OPENJDK_TARGET_OS
+else ifeq ($(OPENJDK_TARGET_OS), windows)
         LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
-endif # OPENJDK_TARGET_OS
+else ifeq ($(OPENJDK_TARGET_OS), solaris)
+        # Solaris still uses OPENWIN_LIB ..
+        LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
+else    # .. all other Unixes can use X_LIBS
+        LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
+endif
 
 $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN,\
                 LIBRARY:=splashscreen,\
                 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
                 SRC:=$(LIBSPLASHSCREEN_DIRS),\

@@ -2858,10 +2861,14 @@
   endif
 
   ifeq ($(OPENJDK_TARGET_CPU), ppc)
         LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC
   endif
+
+  ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+       LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
+  endif
 endif
 
 LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
 
 $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND,\