stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8079771: Fix SoundLibraries.gmk mismerge after JDK-8072665

Browse Source 
Reviewed-by: dholmes, erikj
This commit is contained in:
Magnus Ihse Bursie 2015-05-08 09:42:36 +02:00
parent bd394344b3
commit 4f0d955e38
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/make/lib/SoundLibraries.gmk
View File

@ -111,10 +111,6 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
endif # OPENJDK_TARGET_OS solaris
ifeq ($(OPENJDK_TARGET_CPU), aarch64)
LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
endif
LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \

1
jdk/src/java.desktop/share/native/libjsound/SoundDefs.h
View File

@ -34,7 +34,6 @@
#define X_BSD 4
#define X_MACOSX 5
#define X_AARCH64 9
// **********************************
// Make sure you set X_PLATFORM defines correctly.
// Everything depends upon this flag being setup correctly.