Skip to content

Commit

Permalink
build: Remove unnecessary linkages to shared libraries.
Browse files Browse the repository at this point in the history
The core does not need to be linked with the ae-bridge because it does
not invoke any ae-bridge methods.

None of the plugins needed to be linked with the core because they do
not invoke core methods; they merely handle callbacks.

The front-end does not need to be linked with the core because it dyn-
amically loads the core library at run-time.
  • Loading branch information
littleguy77 committed Nov 20, 2013
1 parent 908e492 commit 3cc146e
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 12 deletions.
2 changes: 1 addition & 1 deletion jni/audio-sdl/projects/android/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include $(CLEAR_VARS)
SRCDIR := ../../src

LOCAL_MODULE := audio-sdl
LOCAL_SHARED_LIBRARIES := SDL2 core
LOCAL_SHARED_LIBRARIES := SDL2
LOCAL_STATIC_LIBRARIES := samplerate
#LOCAL_ARM_MODE := arm

Expand Down
3 changes: 1 addition & 2 deletions jni/core/projects/android/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ include $(CLEAR_VARS)
SRCDIR := ../../src

LOCAL_MODULE := core
LOCAL_SHARED_LIBRARIES := ae-imports SDL2
LOCAL_SHARED_LIBRARIES := SDL2
LOCAL_ARM_MODE := arm

LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/$(SRCDIR) \
$(SDL_INCLUDES) \
$(AE_BRIDGE_INCLUDES) \
$(SYSROOT)/usr/include/ \
# ^ Workaround for some reason 4.6 gcc doesnt include the usr/include directory

Expand Down
2 changes: 1 addition & 1 deletion jni/front-end/projects/android/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include $(CLEAR_VARS)
SRCDIR := ../../src

LOCAL_MODULE := front-end
LOCAL_SHARED_LIBRARIES := ae-imports SDL2 core
LOCAL_SHARED_LIBRARIES := ae-imports SDL2
#LOCAL_ARM_MODE := arm

LOCAL_C_INCLUDES := \
Expand Down
2 changes: 1 addition & 1 deletion jni/gles2glide64/projects/android/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include $(CLEAR_VARS)
SRCDIR := ../../src

LOCAL_MODULE := gles2glide64
LOCAL_SHARED_LIBRARIES := ae-imports SDL2 core
LOCAL_SHARED_LIBRARIES := ae-imports SDL2
LOCAL_STATIC_LIBRARIES := png
LOCAL_ARM_MODE := arm

Expand Down
2 changes: 1 addition & 1 deletion jni/gles2n64/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include $(CLEAR_VARS)
SRCDIR := src

LOCAL_MODULE := gles2n64
LOCAL_SHARED_LIBRARIES := ae-imports SDL2 core
LOCAL_SHARED_LIBRARIES := ae-imports SDL2
LOCAL_STATIC_LIBRARIES := cpufeatures
LOCAL_ARM_MODE := arm

Expand Down
2 changes: 1 addition & 1 deletion jni/gles2rice/projects/android/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include $(CLEAR_VARS)
SRCDIR := ../../src

LOCAL_MODULE := gles2rice
LOCAL_SHARED_LIBRARIES := ae-imports SDL2 core
LOCAL_SHARED_LIBRARIES := ae-imports SDL2
LOCAL_STATIC_LIBRARIES := png
LOCAL_ARM_MODE := arm

Expand Down
2 changes: 0 additions & 2 deletions jni/input-android/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ include $(CLEAR_VARS)

LOCAL_MODULE := input-android

LOCAL_SHARED_LIBRARIES := core

LOCAL_C_INCLUDES := $(M64P_API_INCLUDES)

LOCAL_SRC_FILES := plugin.c
Expand Down
3 changes: 0 additions & 3 deletions jni/rsp-hle/projects/android/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ include $(CLEAR_VARS)
SRCDIR := ../../src

MY_LOCAL_MODULE := rsp-hle
MY_LOCAL_SHARED_LIBRARIES := core
MY_LOCAL_ARM_MODE := arm

MY_LOCAL_C_INCLUDES := $(M64P_API_INCLUDES)
Expand All @@ -29,7 +28,6 @@ MY_LOCAL_LDFLAGS := -Wl,-version-script,$(LOCAL_PATH)/$(SRCDIR)/rsp_api_export.v

include $(CLEAR_VARS)

LOCAL_SHARED_LIBRARIES := $(MY_LOCAL_SHARED_LIBRARIES)
LOCAL_ARM_MODE := $(MY_LOCAL_ARM_MODE)
LOCAL_C_INCLUDES := $(MY_LOCAL_C_INCLUDES)
LOCAL_SRC_FILES := $(MY_LOCAL_SRC_FILES)
Expand All @@ -45,7 +43,6 @@ include $(BUILD_SHARED_LIBRARY)

include $(CLEAR_VARS)

LOCAL_SHARED_LIBRARIES := $(MY_LOCAL_SHARED_LIBRARIES)
LOCAL_ARM_MODE := $(MY_LOCAL_ARM_MODE)
LOCAL_C_INCLUDES := $(MY_LOCAL_C_INCLUDES)
LOCAL_SRC_FILES := $(MY_LOCAL_SRC_FILES)
Expand Down

0 comments on commit 3cc146e

Please sign in to comment.