Permalink
Browse files

Merge pull request #440 from littleguy77/gliden64-glidenhq-dependencies

Add dependencies for GLideN64/GLideNHQ
  • Loading branch information...
Gillou68310 committed Jun 1, 2015
2 parents eaa352e + b9b45d4 commit c58e8a7657f62b05dd549a3dd6148ceebcd03c06
Showing 338 changed files with 148,655 additions and 17 deletions.
View
@@ -5,6 +5,7 @@ M64P_API_INCLUDES := $(JNI_LOCAL_PATH)/mupen64plus-core/src/api/
SDL_INCLUDES := $(JNI_LOCAL_PATH)/SDL2/include/
PNG_INCLUDES := $(JNI_LOCAL_PATH)/png/include/
SAMPLERATE_INCLUDES := $(JNI_LOCAL_PATH)/libsamplerate/
+FREETYPE_INCLUDES := $(JNI_LOCAL_PATH)/freetype/include/
COMMON_CFLAGS := \
-O3 \
@@ -20,6 +21,7 @@ COMMON_CPPFLAGS := \
include $(JNI_LOCAL_PATH)/SDL2/Android.mk
include $(JNI_LOCAL_PATH)/png/Android.mk
+include $(JNI_LOCAL_PATH)/freetype.mk
include $(JNI_LOCAL_PATH)/libsamplerate/Android.mk
include $(JNI_LOCAL_PATH)/ae-bridge/Android.mk
include $(JNI_LOCAL_PATH)/mupen64plus-audio-sdl.mk

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,24 @@
+#ifndef __gl3ext_h_
+#define __gl3ext_h_
+
+/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/* OpenGL ES 3 Extensions
+ *
+ * After an OES extension's interactions with OpenGl ES 3.0 have been documented,
+ * its tokens and function definitions should be added to this file in a manner
+ * that does not conflict with gl2ext.h or gl3.h.
+ *
+ * Tokens and function definitions for extensions that have become standard
+ * features in OpenGL ES 3.0 will not be added to this file.
+ *
+ * Applications using OpenGL-ES-2-only extensions should include gl2ext.h
+ */
+
+#endif /* __gl3ext_h_ */
+
@@ -0,0 +1,30 @@
+#ifndef __gl3platform_h_
+#define __gl3platform_h_
+
+/* $Revision: 18437 $ on $Date:: 2012-07-08 23:31:39 -0700 #$ */
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/* Platform-specific types and definitions for OpenGL ES 3.X gl3.h
+ *
+ * Adopters may modify khrplatform.h and this file to suit their platform.
+ * You are encouraged to submit all modifications to the Khronos group so that
+ * they can be included in future versions of this file. Please submit changes
+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
+ * by filing a bug against product "OpenGL-ES" component "Registry".
+ */
+
+#include <KHR/khrplatform.h>
+
+#ifndef GL_APICALL
+#define GL_APICALL KHRONOS_APICALL
+#endif
+
+#ifndef GL_APIENTRY
+#define GL_APIENTRY KHRONOS_APIENTRY
+#endif
+
+#endif /* __gl3platform_h_ */
Binary file not shown.
Binary file not shown.
@@ -41,10 +41,11 @@ static JavaVM* mVm;
static void* mReserved;
// Library handles
-static void *handleAEI; // libae-imports.so
-static void *handleSDL; // libSDL2.so
-static void *handleCore; // libmupen64plus-core.so
-static void *handleFront; // libmupen64plus-ui-console.so
+static void *handleAEI; // libae-imports.so
+static void *handleSDL; // libSDL2.so
+static void *handleFreetype; // libfreetype.so
+static void *handleCore; // libmupen64plus-core.so
+static void *handleFront; // libmupen64plus-ui-console.so
// Function types
typedef jint (*pJNI_OnLoad) (JavaVM* vm, void* reserved);
@@ -134,13 +135,14 @@ extern "C" DECLSPEC void SDLCALL Java_paulscode_android_mupen64plusae_jni_Native
env->ReleaseStringUTFChars(jlibPath, libPath);
// Open shared libraries
- handleAEI = loadLibrary(path, "ae-imports");
- handleSDL = loadLibrary(path, "SDL2");
- handleCore = loadLibrary(path, "mupen64plus-core");
- handleFront = loadLibrary(path, "mupen64plus-ui-console");
+ handleAEI = loadLibrary(path, "ae-imports");
+ handleSDL = loadLibrary(path, "SDL2");
+ handleFreetype = loadLibrary(path, "freetype");
+ handleCore = loadLibrary(path, "mupen64plus-core");
+ handleFront = loadLibrary(path, "mupen64plus-ui-console");
// Make sure we don't have any typos
- if (!handleAEI || !handleSDL || !handleCore || !handleFront)
+ if (!handleAEI || !handleSDL || !handleFreetype || !handleCore || !handleFront )
{
LOGE("Could not load libraries: be sure the paths are correct");
}
@@ -190,16 +192,18 @@ extern "C" DECLSPEC void SDLCALL Java_paulscode_android_mupen64plusae_jni_Native
frontMain = NULL;
// Close shared libraries
- unloadLibrary(handleFront, "mupen64plus-ui-console");
- unloadLibrary(handleCore, "mupen64plus-core");
- unloadLibrary(handleSDL, "SDL2");
- unloadLibrary(handleAEI, "ae-imports");
+ unloadLibrary(handleFront, "mupen64plus-ui-console");
+ unloadLibrary(handleCore, "mupen64plus-core");
+ unloadLibrary(handleFreetype, "freetype");
+ unloadLibrary(handleSDL, "SDL2");
+ unloadLibrary(handleAEI, "ae-imports");
// Nullify handles so that they can no longer be used
- handleFront = NULL;
- handleCore = NULL;
- handleSDL = NULL;
- handleAEI = NULL;
+ handleFront = NULL;
+ handleCore = NULL;
+ handleFreetype = NULL;
+ handleSDL = NULL;
+ handleAEI = NULL;
}
extern "C" DECLSPEC jint SDLCALL Java_paulscode_android_mupen64plusae_jni_NativeExports_emuStart(JNIEnv* env, jclass cls, jstring juserDataPath, jstring juserCachePath, jobjectArray jargv)
View
@@ -0,0 +1,51 @@
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := freetype
+
+# compile in ARM mode, since the glyph loader/renderer is a hotspot
+# when loading complex pages in the browser
+#
+LOCAL_ARM_MODE := arm
+LOCAL_MODULE:= freetype
+LOCAL_SHARED_LIBRARIES := png
+
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/$(SRCDIR)/builds \
+ $(LOCAL_PATH)/$(SRCDIR)/include \
+ $(PNG_INCLUDES) \
+
+LOCAL_SRC_FILES:= \
+ $(SRCDIR)/src/base/ftbbox.c \
+ $(SRCDIR)/src/base/ftbitmap.c \
+ $(SRCDIR)/src/base/ftfstype.c \
+ $(SRCDIR)/src/base/ftglyph.c \
+ $(SRCDIR)/src/base/ftlcdfil.c \
+ $(SRCDIR)/src/base/ftstroke.c \
+ $(SRCDIR)/src/base/fttype1.c \
+ $(SRCDIR)/src/base/ftxf86.c \
+ $(SRCDIR)/src/base/ftbase.c \
+ $(SRCDIR)/src/base/ftsystem.c \
+ $(SRCDIR)/src/base/ftinit.c \
+ $(SRCDIR)/src/base/ftgasp.c \
+ $(SRCDIR)/src/gzip/ftgzip.c \
+ $(SRCDIR)/src/raster/raster.c \
+ $(SRCDIR)/src/sfnt/sfnt.c \
+ $(SRCDIR)/src/smooth/smooth.c \
+ $(SRCDIR)/src/autofit/autofit.c \
+ $(SRCDIR)/src/truetype/truetype.c \
+ $(SRCDIR)/src/cff/cff.c \
+ $(SRCDIR)/src/psnames/psnames.c \
+ $(SRCDIR)/src/pshinter/pshinter.c
+
+LOCAL_CFLAGS += -W -Wall
+LOCAL_CFLAGS += -fPIC -DPIC
+LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
+LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
+
+# the following is for testing only, and should not be used in final builds
+# of the product
+#LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
+
+LOCAL_CFLAGS += -O2
+
+include $(BUILD_SHARED_LIBRARY)
View
@@ -0,0 +1,61 @@
+# this is now the default FreeType build for Android
+#
+ifndef USE_FREETYPE
+USE_FREETYPE := 2.4.2
+endif
+
+ifeq ($(USE_FREETYPE),2.4.2)
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# compile in ARM mode, since the glyph loader/renderer is a hotspot
+# when loading complex pages in the browser
+#
+LOCAL_ARM_MODE := arm
+
+LOCAL_SRC_FILES:= \
+ src/base/ftbbox.c \
+ src/base/ftbitmap.c \
+ src/base/ftfstype.c \
+ src/base/ftglyph.c \
+ src/base/ftlcdfil.c \
+ src/base/ftstroke.c \
+ src/base/fttype1.c \
+ src/base/ftxf86.c \
+ src/base/ftbase.c \
+ src/base/ftsystem.c \
+ src/base/ftinit.c \
+ src/base/ftgasp.c \
+ src/gzip/ftgzip.c \
+ src/raster/raster.c \
+ src/sfnt/sfnt.c \
+ src/smooth/smooth.c \
+ src/autofit/autofit.c \
+ src/truetype/truetype.c \
+ src/cff/cff.c \
+ src/psnames/psnames.c \
+ src/pshinter/pshinter.c
+
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/builds \
+ $(LOCAL_PATH)/include \
+ external/libpng \
+ external/zlib
+
+LOCAL_CFLAGS += -W -Wall
+LOCAL_CFLAGS += -fPIC -DPIC
+LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
+LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
+
+LOCAL_SHARED_LIBRARIES += libpng libz
+
+# the following is for testing only, and should not be used in final builds
+# of the product
+#LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
+
+LOCAL_CFLAGS += -O2
+
+LOCAL_MODULE:= libft2
+
+include $(BUILD_SHARED_LIBRARY)
+endif
View
@@ -0,0 +1,49 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
No changes.
Oops, something went wrong.

0 comments on commit c58e8a7

Please sign in to comment.