소스 검색

Corrected issue with OpenAL Soft static

Ray San 7 년 전
부모
커밋
a6ccc14d39
1개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 6 1
      src/Makefile

+ 6 - 1
src/Makefile

@@ -237,6 +237,11 @@ ifeq ($(RAYLIB_LIBTYPE),SHARED)
     CFLAGS += -fPIC -DBUILD_LIBTYPE_SHARED
 endif
 
+# Define required compilation flags for OpenAL Soft STATIC lib
+ifeq ($(OPENAL_LIBTYPE),STATIC)
+    ALFLAGS = -DAL_LIBTYPE_STATIC -Wl,-allow-multiple-definition
+endif
+
 # Define include paths for required headers
 # NOTE: Several external required libraries (stb and others)
 INCLUDE_PATHS = -I. -Iexternal -Iexternal/include
@@ -263,7 +268,7 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID)
     # Force linking of library module to define symbol
     LDFLAGS += -u ANativeActivity_onCreate
     # Library paths containing required libs
-    LDFLAGS += -L. -Lsrc -L$(RAYLIB_RELEASE_PATH) -Lexternal/openal_soft/lib/android
+    LDFLAGS += -L. -Lsrc -L$(RAYLIB_RELEASE_PATH)
 
     LDLIBS = -lopenal -llog -landroid -lEGL -lGLESv2 -lOpenSLES -latomic -lc -lm
 endif