Skip to content

S
swiftshader
Commit 394b7078 by Greg Hartman
Options

Makefile updates to productionize the release

Change-Id: I9b043641f2c978d50cc4ae6492dff74ad5f006d6 Reviewed-on: https://swiftshader-review.googlesource.com/3019Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent 4969f8fd
Showing with 193 additions and 79 deletions
src/Android.mk
...@@ -4,6 +4,7 @@ include $(CLEAR_VARS) ...@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_MODULE := swiftshader_top LOCAL_MODULE := swiftshader_top
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
Common/CPUID.cpp \ Common/CPUID.cpp \
......
src/LLVM/Android.mk
...@@ -3,8 +3,8 @@ include $(CLEAR_VARS) ...@@ -3,8 +3,8 @@ include $(CLEAR_VARS)
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib/egl
LOCAL_MODULE := libLLVM_swiftshader LOCAL_MODULE := libLLVM_swiftshader
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
lib/Analysis/AliasAnalysis.cpp \ lib/Analysis/AliasAnalysis.cpp \
......
src/OpenGL/compiler/Android.mk
...@@ -4,6 +4,7 @@ include $(CLEAR_VARS) ...@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_MODULE := swiftshader_compiler LOCAL_MODULE := swiftshader_compiler
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
preprocessor/Diagnostics.cpp \ preprocessor/Diagnostics.cpp \
......
src/OpenGL/libEGL/Android.mk
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib/egl COMMON_CFLAGS := \
LOCAL_MODULE := libEGL_swiftshader -DLOG_TAG=\"libEGL_swiftshader\" \
-std=c++11 \
-DEGLAPI= \
-DEGL_EGLEXT_PROTOTYPES
LOCAL_SRC_FILES += \ COMMON_SRC_FILES := \
Config.cpp \ Config.cpp \
Display.cpp \ Display.cpp \
Surface.cpp \ Surface.cpp \
libEGL.cpp \ libEGL.cpp \
main.cpp main.cpp
LOCAL_CFLAGS += -DLOG_TAG=\"libEGL_swiftshader\" COMMON_C_INCLUDES := \
device/google/gce/include \
$(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../
# Android's make system also uses NDEBUG, so we need to set/unset it forcefully COMMON_STATIC_LIBRARIES := \
# Uncomment for ON: swiftshader_top \
LOCAL_CFLAGS += -UNDEBUG -g -O0 libgcemetadata
# Uncomment for OFF:
#LOCAL_CFLAGS += -DANGLE_DISABLE_TRACE
LOCAL_CFLAGS += -std=c++11 COMMON_SHARED_LIBRARIES := \
LOCAL_CFLAGS += -DEGLAPI= libgceframebufferconfig \
LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES libdl \
liblog \
libandroid \
libutils \
libcutils \
libhardware \
$(GCE_STLPORT_LIBS)
# These changes tie the build to Cloud Android. Do something else COMMON_LDFLAGS := \
# for other Android builds. -Wl,--version-script=$(LOCAL_PATH)/exports.map \
LOCAL_STATIC_LIBRARIES += swiftshader_top libgceframebufferconfig libgcemetadata -Wl,--hash-style=sysv
LOCAL_C_INCLUDES += device/google/gce/include
LOCAL_SHARED_LIBRARIES += libdl liblog libandroid libutils libcutils libhardware $(GCE_STLPORT_LIBS) include $(CLEAR_VARS)
LOCAL_LDFLAGS += -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv
LOCAL_C_INCLUDES += \ LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
$(LOCAL_PATH)/../include \ LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
$(LOCAL_PATH)/../ \ LOCAL_MODULE := libEGL_swiftshader_vendor_debug
$(LOCAL_PATH)/../../ LOCAL_MODULE_TAGS := optional
LOCAL_INSTALLED_MODULE_STEM := libEGL_swiftshader.so
LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
LOCAL_CLANG := true
LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
LOCAL_MODULE := libEGL_swiftshader_vendor_release
LOCAL_MODULE_TAGS := optional
LOCAL_INSTALLED_MODULE_STEM := libEGL_swiftshader.so
LOCAL_CFLAGS += $(COMMON_CFLAGS) -DANGLE_DISABLE_TRACE
LOCAL_CLANG := true
LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
src/OpenGL/libGLES_CM/Android.mk
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_CLANG := true COMMON_CFLAGS := \
-DLOG_TAG=\"libGLES_CM_swiftshader\" \
-std=c++11 \
-fno-operator-names \
-msse2 \
-D__STDC_CONSTANT_MACROS \
-D__STDC_LIMIT_MACROS \
-DEGLAPI= \
-DGL_API= \
-DGL_APICALL= \
-DGL_GLEXT_PROTOTYPES
LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib/egl
LOCAL_MODULE := libGLESv1_CM_swiftshader
LOCAL_SRC_FILES += \ COMMON_SRC_FILES := \
Buffer.cpp \ Buffer.cpp \
Context.cpp \ Context.cpp \
Device.cpp \ Device.cpp \
...@@ -20,27 +27,7 @@ LOCAL_SRC_FILES += \ ...@@ -20,27 +27,7 @@ LOCAL_SRC_FILES += \
utilities.cpp \ utilities.cpp \
VertexDataManager.cpp VertexDataManager.cpp
LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_CM_swiftshader\" COMMON_C_INCLUDES := \
LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
LOCAL_CFLAGS += -std=c++11
LOCAL_CFLAGS += -DEGLAPI=
LOCAL_CFLAGS += -DGL_API=
LOCAL_CFLAGS += -DGL_APICALL=
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
# Android's make system also uses NDEBUG, so we need to set/unset it forcefully
# Uncomment for ON:
LOCAL_CFLAGS += -UNDEBUG -g -O0
# Uncomment for OFF:
#LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
LOCAL_SHARED_LIBRARIES += libdl liblog libcutils libhardware libui libutils \
$(GCE_STLPORT_LIBS)
LOCAL_STATIC_LIBRARIES += swiftshader_top libLLVM_swiftshader
LOCAL_LDFLAGS += -Wl,--gc-sections -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../ \
...@@ -53,6 +40,59 @@ LOCAL_C_INCLUDES += \ ...@@ -53,6 +40,59 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Main/ $(LOCAL_PATH)/../../Main/
COMMON_STATIC_LIBRARIES := swiftshader_top libLLVM_swiftshader
COMMON_SHARED_LIBRARIES := \
libdl \
liblog \
libcutils \
libhardware \
libui \
libutils \
$(GCE_STLPORT_LIBS)
COMMON_LDFLAGS := \
-Wl,--gc-sections \
-Wl,--version-script=$(LOCAL_PATH)/exports.map \
-Wl,--hash-style=sysv
include $(CLEAR_VARS)
LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_debug
LOCAL_MODULE_TAGS := optional
LOCAL_INSTALLED_MODULE_STEM := libGLESv1_CM_swiftshader.so
LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
LOCAL_CLANG := true
LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_release
LOCAL_MODULE_TAGS := optional
LOCAL_INSTALLED_MODULE_STEM := libGLESv1_CM_swiftshader.so
LOCAL_CFLAGS += \
$(COMMON_CFLAGS) \
-fomit-frame-pointer \
-ffunction-sections \
-fdata-sections \
-DANGLE_DISABLE_TRACE
LOCAL_CLANG := true
LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
src/OpenGL/libGLESv2/Android.mk
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib/egl COMMON_CFLAGS := \
LOCAL_MODULE := libGLESv2_swiftshader -DLOG_TAG=\"libGLESv2_swiftshader\" \
-fno-operator-names \
-msse2 \
-D__STDC_CONSTANT_MACROS \
-D__STDC_LIMIT_MACROS \
-std=c++11 \
-DGL_API= \
-DGL_APICALL= \
-DGL_GLEXT_PROTOTYPES
LOCAL_SRC_FILES += \ COMMON_SRC_FILES := \
Buffer.cpp \ Buffer.cpp \
Context.cpp \ Context.cpp \
Device.cpp \ Device.cpp \
...@@ -26,27 +31,7 @@ LOCAL_SRC_FILES += \ ...@@ -26,27 +31,7 @@ LOCAL_SRC_FILES += \
VertexArray.cpp \ VertexArray.cpp \
VertexDataManager.cpp \ VertexDataManager.cpp \
LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2_swiftshader\" COMMON_C_INCLUDES := \
# Android's make system also uses NDEBUG, so we need to set/unset it forcefully
# Uncomment for ON:
LOCAL_CFLAGS += -UNDEBUG -g -O0
# Uncomment for OFF:
#LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
LOCAL_CFLAGS += -std=c++11
LOCAL_CFLAGS += -DGL_API=
LOCAL_CFLAGS += -DGL_APICALL=
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
LOCAL_SHARED_LIBRARIES += libdl liblog libcutils libhardware libui libutils \
$(GCE_STLPORT_LIBS)
LOCAL_STATIC_LIBRARIES += swiftshader_compiler swiftshader_top libLLVM_swiftshader
LOCAL_LDFLAGS += -Wl,--gc-sections -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../ \
...@@ -59,6 +44,62 @@ LOCAL_C_INCLUDES += \ ...@@ -59,6 +44,62 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Main/ $(LOCAL_PATH)/../../Main/
COMMON_STATIC_LIBRARIES := \
swiftshader_compiler \
swiftshader_top \
libLLVM_swiftshader
COMMON_SHARED_LIBRARIES := \
libdl \
liblog \
libcutils \
libhardware \
libui \
libutils \
$(GCE_STLPORT_LIBS)
COMMON_LDFLAGS := \
-Wl,--gc-sections \
-Wl,--version-script=$(LOCAL_PATH)/exports.map \
-Wl,--hash-style=sysv
include $(CLEAR_VARS)
LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
LOCAL_MODULE := libGLESv2_swiftshader_vendor_debug
LOCAL_MODULE_TAGS := optional
LOCAL_INSTALLED_MODULE_STEM := libGLESv2_swiftshader.so
LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
LOCAL_CLANG := true
LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
LOCAL_MODULE := libGLESv2_swiftshader_vendor_release
LOCAL_MODULE_TAGS := optional
LOCAL_INSTALLED_MODULE_STEM := libGLESv2_swiftshader.so
LOCAL_CFLAGS += \
$(COMMON_CFLAGS) \
-fomit-frame-pointer \
-ffunction-sections \
-fdata-sections \
-DANGLE_DISABLE_TRACE
LOCAL_CLANG := true
LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment