SwallowOS/XServer-XSDL-android-src
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build

Browse Source 
Change-Id: I05aad84e0c0fdd514b06126ee15645fe45c4b033
This commit is contained in:
MapleLeaf
2018-03-08 22:37:19 +08:00
parent 5395d92370
commit 8d86788a46
57 changed files with 615 additions and 4121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.classpath
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="con" path="org.eclipse.andmore.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="org.eclipse.andmore.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="org.eclipse.andmore.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

49
.project
View File

@@ -1,49 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>MainActivity</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.andmore.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.andmore.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.andmore.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.andmore.AndroidNature</nature>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

4
.settings/org.eclipse.jdt.core.prefs
View File

@@ -1,4 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.source=1.6

24
Android.mk Normal file
View File

@@ -0,0 +1,24 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 org.apache.http.legacy
LOCAL_JNI_SHARED_LIBRARIES := libapplication \
libsdl-1.2 \
libsdl_main \
libsdl_native_helpers \
libsdl_ttf \
# TODO: enable proguard once development has settled down
#LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_PACKAGE_NAME := xserver
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))

4
jni/Android.mk
View File

@@ -1 +1,5 @@
SDL_JAVA_PACKAGE_PATH := x_org_server
SDL_VERSION := 1.2
include $(call all-subdir-makefiles)

4
jni/application/android-shmem/Android.mk
View File

@@ -2,10 +2,10 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := android-shmem
LOCAL_MODULE := libandroid-shmem
LOCAL_C_INCLUDES := $(LOCAL_PATH)
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/libancillary -D_LINUX_IPC_H
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/libancillary -D_LINUX_IPC_H -DNO_debian_ipc_perm
LOCAL_CPP_EXTENSION := .cpp

4
jni/application/android-shmem/sys/shm.h
View File

@@ -48,7 +48,7 @@ typedef __key_t key_t;
typedef uint32_t __uid_t;
typedef uint32_t __gid_t;
*/
#ifdef NO_debian_ipc_perm
/* Data structure used to pass permission information to IPC operations. */
struct debian_ipc_perm /* We cannot use Android version, because there are no padding fields */
{
@@ -64,7 +64,7 @@ struct debian_ipc_perm /* We cannot use Android version, because there are no pa
unsigned long int __unused1;
unsigned long int __unused2;
};
#endif
/* Data structure describing a shared memory segment. */
struct shmid_ds
{

15
jni/application/libICE-1.0.8/Android.mk
View File

@@ -7,20 +7,23 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libICE
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/ICE \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
LOCAL_SRCS := \
src/*.c \
LOCAL_SHARED_LIBRARIES := xcb Xau Xdmcp X11 Xext Xrender xkbfile
LOCAL_STATIC_LIBRARIES := android_support
LOCAL_SRC_FILES := \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender libxkbfile
LOCAL_LDFLAGS := -pie

4
jni/application/libICE-1.0.8/src/accept.c
View File

@@ -47,7 +47,7 @@ IceAcceptConnection (
/*
* Accept the connection.
*/
if ((newconn = _IceTransAccept (listenObj->trans_conn, &status)) == NULL)
{
@@ -57,7 +57,7 @@ IceAcceptConnection (
*statusRet = IceAcceptFailure;
return (NULL);
}
*/
/*
* Set close-on-exec so that programs that fork() don't get confused.

8
jni/application/libICE-1.0.8/src/connect.c
View File

@@ -488,10 +488,10 @@ ConnectToPeer (char *networkIdsList, char **actualConnectionRet)
for (retry = ICE_CONNECTION_RETRIES; retry >= 0; retry--)
{
if ((trans_conn = _IceTransOpenCOTSClient (address)) == NULL)
{
break;
}
//if ((trans_conn = _IceTransOpenCOTSClient (address)) == NULL)
//{
// break;
//}
if ((connect_stat = _IceTransConnect (trans_conn, address)) < 0)
{

15
jni/application/libSM-1.2.2/Android.mk
View File

@@ -7,20 +7,23 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libSM
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/SM \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
LOCAL_SRCS := \
src/*.c \
LOCAL_SHARED_LIBRARIES := xcb Xau Xdmcp X11 Xext Xrender xkbfile ICE
LOCAL_STATIC_LIBRARIES := android_support
LOCAL_SRC_FILES := \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender libxkbfile libICE
#LOCAL_LDFLAGS := -pie

549
jni/application/libX11-1.6.2/Android.mk
View File

@@ -8,8 +8,8 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libX11
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
$(LOCAL_PATH) \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/src \
@@ -20,278 +20,281 @@ LOCAL_C_INCLUDES := \
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DXCMSDIR=\"/proc/self/cwd/usr/share/X11\" -DMAXHOSTNAMELEN=255
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/xcms/*.c) \
$(wildcard $(LOCAL_PATH)/src/xkb/*.c) \
$(wildcard $(LOCAL_PATH)/src/xlibi18n/*.c) \
$(wildcard $(LOCAL_PATH)/modules/im/ximcp/*.c) \
$(wildcard $(LOCAL_PATH)/modules/lc/def/*.c) \
$(wildcard $(LOCAL_PATH)/modules/lc/gen/*.c) \
$(wildcard $(LOCAL_PATH)/modules/lc/Utf8/*.c) \
$(wildcard $(LOCAL_PATH)/modules/lc/xlocale/*.c) \
$(wildcard $(LOCAL_PATH)/modules/om/generic/*.c) \
$(LOCAL_PATH)/src/AllCells.c \
$(LOCAL_PATH)/src/AllowEv.c \
$(LOCAL_PATH)/src/AllPlanes.c \
$(LOCAL_PATH)/src/AutoRep.c \
$(LOCAL_PATH)/src/Backgnd.c \
$(LOCAL_PATH)/src/BdrWidth.c \
$(LOCAL_PATH)/src/Bell.c \
$(LOCAL_PATH)/src/Border.c \
$(LOCAL_PATH)/src/ChAccCon.c \
$(LOCAL_PATH)/src/ChActPGb.c \
$(LOCAL_PATH)/src/ChClMode.c \
$(LOCAL_PATH)/src/ChCmap.c \
$(LOCAL_PATH)/src/ChGC.c \
$(LOCAL_PATH)/src/ChKeyCon.c \
$(LOCAL_PATH)/src/ChkIfEv.c \
$(LOCAL_PATH)/src/ChkMaskEv.c \
$(LOCAL_PATH)/src/ChkTypEv.c \
$(LOCAL_PATH)/src/ChkTypWEv.c \
$(LOCAL_PATH)/src/ChkWinEv.c \
$(LOCAL_PATH)/src/ChPntCon.c \
$(LOCAL_PATH)/src/ChProp.c \
$(LOCAL_PATH)/src/ChSaveSet.c \
$(LOCAL_PATH)/src/ChWAttrs.c \
$(LOCAL_PATH)/src/ChWindow.c \
$(LOCAL_PATH)/src/CirWin.c \
$(LOCAL_PATH)/src/CirWinDn.c \
$(LOCAL_PATH)/src/CirWinUp.c \
$(LOCAL_PATH)/src/ClDisplay.c \
$(LOCAL_PATH)/src/ClearArea.c \
$(LOCAL_PATH)/src/Clear.c \
$(LOCAL_PATH)/src/ConfWind.c \
$(LOCAL_PATH)/src/Context.c \
$(LOCAL_PATH)/src/ConvSel.c \
$(LOCAL_PATH)/src/CopyArea.c \
$(LOCAL_PATH)/src/CopyCmap.c \
$(LOCAL_PATH)/src/CopyGC.c \
$(LOCAL_PATH)/src/CopyPlane.c \
$(LOCAL_PATH)/src/CrBFData.c \
$(LOCAL_PATH)/src/CrCmap.c \
$(LOCAL_PATH)/src/CrCursor.c \
$(LOCAL_PATH)/src/CrGC.c \
$(LOCAL_PATH)/src/CrGlCur.c \
$(LOCAL_PATH)/src/CrPFBData.c \
$(LOCAL_PATH)/src/CrPixmap.c \
$(LOCAL_PATH)/src/CrWindow.c \
$(LOCAL_PATH)/src/Cursor.c \
$(LOCAL_PATH)/src/DefCursor.c \
$(LOCAL_PATH)/src/DelProp.c \
$(LOCAL_PATH)/src/Depths.c \
$(LOCAL_PATH)/src/DestSubs.c \
$(LOCAL_PATH)/src/DestWind.c \
$(LOCAL_PATH)/src/DisName.c \
$(LOCAL_PATH)/src/DrArc.c \
$(LOCAL_PATH)/src/DrArcs.c \
$(LOCAL_PATH)/src/DrLine.c \
$(LOCAL_PATH)/src/DrLines.c \
$(LOCAL_PATH)/src/DrPoint.c \
$(LOCAL_PATH)/src/DrPoints.c \
$(LOCAL_PATH)/src/DrRect.c \
$(LOCAL_PATH)/src/DrRects.c \
$(LOCAL_PATH)/src/DrSegs.c \
$(LOCAL_PATH)/src/ErrDes.c \
$(LOCAL_PATH)/src/ErrHndlr.c \
$(LOCAL_PATH)/src/evtomask.c \
$(LOCAL_PATH)/src/EvToWire.c \
$(LOCAL_PATH)/src/FetchName.c \
$(LOCAL_PATH)/src/FillArc.c \
$(LOCAL_PATH)/src/FillArcs.c \
$(LOCAL_PATH)/src/FillPoly.c \
$(LOCAL_PATH)/src/FillRct.c \
$(LOCAL_PATH)/src/FillRcts.c \
$(LOCAL_PATH)/src/FilterEv.c \
$(LOCAL_PATH)/src/Flush.c \
$(LOCAL_PATH)/src/Font.c \
$(LOCAL_PATH)/src/FontInfo.c \
$(LOCAL_PATH)/src/FontNames.c \
$(LOCAL_PATH)/src/FreeCmap.c \
$(LOCAL_PATH)/src/FreeCols.c \
$(LOCAL_PATH)/src/FreeCurs.c \
$(LOCAL_PATH)/src/FreeEData.c \
$(LOCAL_PATH)/src/FreeEventData.c \
$(LOCAL_PATH)/src/FreeGC.c \
$(LOCAL_PATH)/src/FreePix.c \
$(LOCAL_PATH)/src/FSSaver.c \
$(LOCAL_PATH)/src/FSWrap.c \
$(LOCAL_PATH)/src/GCMisc.c \
$(LOCAL_PATH)/src/Geom.c \
$(LOCAL_PATH)/src/GetAtomNm.c \
$(LOCAL_PATH)/src/GetColor.c \
$(LOCAL_PATH)/src/GetDflt.c \
$(LOCAL_PATH)/src/GetEventData.c \
$(LOCAL_PATH)/src/GetFPath.c \
$(LOCAL_PATH)/src/GetFProp.c \
$(LOCAL_PATH)/src/GetGCVals.c \
$(LOCAL_PATH)/src/GetGeom.c \
$(LOCAL_PATH)/src/GetHColor.c \
$(LOCAL_PATH)/src/GetHints.c \
$(LOCAL_PATH)/src/GetIFocus.c \
$(LOCAL_PATH)/src/GetImage.c \
$(LOCAL_PATH)/src/GetKCnt.c \
$(LOCAL_PATH)/src/GetMoEv.c \
$(LOCAL_PATH)/src/GetNrmHint.c \
$(LOCAL_PATH)/src/GetPCnt.c \
$(LOCAL_PATH)/src/GetPntMap.c \
$(LOCAL_PATH)/src/GetProp.c \
$(LOCAL_PATH)/src/GetRGBCMap.c \
$(LOCAL_PATH)/src/GetSOwner.c \
$(LOCAL_PATH)/src/GetSSaver.c \
$(LOCAL_PATH)/src/GetStCmap.c \
$(LOCAL_PATH)/src/GetTxtProp.c \
$(LOCAL_PATH)/src/GetWAttrs.c \
$(LOCAL_PATH)/src/GetWMCMapW.c \
$(LOCAL_PATH)/src/GetWMProto.c \
$(LOCAL_PATH)/src/globals.c \
$(LOCAL_PATH)/src/GrButton.c \
$(LOCAL_PATH)/src/GrKeybd.c \
$(LOCAL_PATH)/src/GrKey.c \
$(LOCAL_PATH)/src/GrPointer.c \
$(LOCAL_PATH)/src/GrServer.c \
$(LOCAL_PATH)/src/Host.c \
$(LOCAL_PATH)/src/Iconify.c \
$(LOCAL_PATH)/src/IfEvent.c \
$(LOCAL_PATH)/src/imConv.c \
$(LOCAL_PATH)/src/ImText16.c \
$(LOCAL_PATH)/src/ImText.c \
$(LOCAL_PATH)/src/ImUtil.c \
$(LOCAL_PATH)/src/InitExt.c \
$(LOCAL_PATH)/src/InsCmap.c \
$(LOCAL_PATH)/src/IntAtom.c \
$(LOCAL_PATH)/src/KeyBind.c \
$(LOCAL_PATH)/src/KeysymStr.c \
$(LOCAL_PATH)/src/KillCl.c \
$(LOCAL_PATH)/src/LiHosts.c \
$(LOCAL_PATH)/src/LiICmaps.c \
$(LOCAL_PATH)/src/LiProps.c \
$(LOCAL_PATH)/src/ListExt.c \
$(LOCAL_PATH)/src/LoadFont.c \
$(LOCAL_PATH)/src/LockDis.c \
$(LOCAL_PATH)/src/locking.c \
$(LOCAL_PATH)/src/LookupCol.c \
$(LOCAL_PATH)/src/LowerWin.c \
$(LOCAL_PATH)/src/Macros.c \
$(LOCAL_PATH)/src/MapRaised.c \
$(LOCAL_PATH)/src/MapSubs.c \
$(LOCAL_PATH)/src/MapWindow.c \
$(LOCAL_PATH)/src/MaskEvent.c \
$(LOCAL_PATH)/src/Misc.c \
$(LOCAL_PATH)/src/ModMap.c \
$(LOCAL_PATH)/src/MoveWin.c \
$(LOCAL_PATH)/src/NextEvent.c \
$(LOCAL_PATH)/src/OCWrap.c \
$(LOCAL_PATH)/src/OMWrap.c \
$(LOCAL_PATH)/src/OpenDis.c \
$(LOCAL_PATH)/src/ParseCmd.c \
$(LOCAL_PATH)/src/ParseCol.c \
$(LOCAL_PATH)/src/ParseGeom.c \
$(LOCAL_PATH)/src/PeekEvent.c \
$(LOCAL_PATH)/src/PeekIfEv.c \
$(LOCAL_PATH)/src/Pending.c \
$(LOCAL_PATH)/src/PixFormats.c \
$(LOCAL_PATH)/src/PmapBgnd.c \
$(LOCAL_PATH)/src/PmapBord.c \
$(LOCAL_PATH)/src/PolyReg.c \
$(LOCAL_PATH)/src/PolyTxt16.c \
$(LOCAL_PATH)/src/PolyTxt.c \
$(LOCAL_PATH)/src/PropAlloc.c \
$(LOCAL_PATH)/src/PutBEvent.c \
$(LOCAL_PATH)/src/PutImage.c \
$(LOCAL_PATH)/src/Quarks.c \
$(LOCAL_PATH)/src/QuBest.c \
$(LOCAL_PATH)/src/QuColor.c \
$(LOCAL_PATH)/src/QuColors.c \
$(LOCAL_PATH)/src/QuCurShp.c \
$(LOCAL_PATH)/src/QuExt.c \
$(LOCAL_PATH)/src/QuKeybd.c \
$(LOCAL_PATH)/src/QuPntr.c \
$(LOCAL_PATH)/src/QuStipShp.c \
$(LOCAL_PATH)/src/QuTextE16.c \
$(LOCAL_PATH)/src/QuTextExt.c \
$(LOCAL_PATH)/src/QuTileShp.c \
$(LOCAL_PATH)/src/QuTree.c \
$(LOCAL_PATH)/src/RaiseWin.c \
$(LOCAL_PATH)/src/RdBitF.c \
$(LOCAL_PATH)/src/RecolorC.c \
$(LOCAL_PATH)/src/ReconfWin.c \
$(LOCAL_PATH)/src/ReconfWM.c \
$(LOCAL_PATH)/src/Region.c \
$(LOCAL_PATH)/src/RegstFlt.c \
$(LOCAL_PATH)/src/RepWindow.c \
$(LOCAL_PATH)/src/RestackWs.c \
$(LOCAL_PATH)/src/RotProp.c \
$(LOCAL_PATH)/src/ScrResStr.c \
$(LOCAL_PATH)/src/SelInput.c \
$(LOCAL_PATH)/src/SendEvent.c \
$(LOCAL_PATH)/src/SetBack.c \
$(LOCAL_PATH)/src/SetClMask.c \
$(LOCAL_PATH)/src/SetClOrig.c \
$(LOCAL_PATH)/src/SetCRects.c \
$(LOCAL_PATH)/src/SetDashes.c \
$(LOCAL_PATH)/src/SetFont.c \
$(LOCAL_PATH)/src/SetFore.c \
$(LOCAL_PATH)/src/SetFPath.c \
$(LOCAL_PATH)/src/SetFunc.c \
$(LOCAL_PATH)/src/SetHints.c \
$(LOCAL_PATH)/src/SetIFocus.c \
$(LOCAL_PATH)/src/SetLocale.c \
$(LOCAL_PATH)/src/SetLStyle.c \
$(LOCAL_PATH)/src/SetNrmHint.c \
$(LOCAL_PATH)/src/SetPMask.c \
$(LOCAL_PATH)/src/SetPntMap.c \
$(LOCAL_PATH)/src/SetRGBCMap.c \
$(LOCAL_PATH)/src/SetSOwner.c \
$(LOCAL_PATH)/src/SetSSaver.c \
$(LOCAL_PATH)/src/SetState.c \
$(LOCAL_PATH)/src/SetStCmap.c \
$(LOCAL_PATH)/src/SetStip.c \
$(LOCAL_PATH)/src/SetTile.c \
$(LOCAL_PATH)/src/SetTSOrig.c \
$(LOCAL_PATH)/src/SetTxtProp.c \
$(LOCAL_PATH)/src/SetWMCMapW.c \
$(LOCAL_PATH)/src/SetWMProto.c \
$(LOCAL_PATH)/src/StBytes.c \
$(LOCAL_PATH)/src/StColor.c \
$(LOCAL_PATH)/src/StColors.c \
$(LOCAL_PATH)/src/StName.c \
$(LOCAL_PATH)/src/StNColor.c \
$(LOCAL_PATH)/src/StrKeysym.c \
$(LOCAL_PATH)/src/StrToText.c \
$(LOCAL_PATH)/src/Sync.c \
$(LOCAL_PATH)/src/Synchro.c \
$(LOCAL_PATH)/src/Text16.c \
$(LOCAL_PATH)/src/Text.c \
$(LOCAL_PATH)/src/TextExt16.c \
$(LOCAL_PATH)/src/TextExt.c \
$(LOCAL_PATH)/src/TextToStr.c \
$(LOCAL_PATH)/src/TrCoords.c \
$(LOCAL_PATH)/src/UndefCurs.c \
$(LOCAL_PATH)/src/UngrabBut.c \
$(LOCAL_PATH)/src/UngrabKbd.c \
$(LOCAL_PATH)/src/UngrabKey.c \
$(LOCAL_PATH)/src/UngrabPtr.c \
$(LOCAL_PATH)/src/UngrabSvr.c \
$(LOCAL_PATH)/src/UninsCmap.c \
$(LOCAL_PATH)/src/UnldFont.c \
$(LOCAL_PATH)/src/UnmapSubs.c \
$(LOCAL_PATH)/src/UnmapWin.c \
$(LOCAL_PATH)/src/VisUtil.c \
$(LOCAL_PATH)/src/WarpPtr.c \
$(LOCAL_PATH)/src/Window.c \
$(LOCAL_PATH)/src/WinEvent.c \
$(LOCAL_PATH)/src/Withdraw.c \
$(LOCAL_PATH)/src/WMGeom.c \
$(LOCAL_PATH)/src/WMProps.c \
$(LOCAL_PATH)/src/WrBitF.c \
$(LOCAL_PATH)/src/xcb_disp.c \
$(LOCAL_PATH)/src/xcb_io.c \
$(LOCAL_PATH)/src/XlibAsync.c \
$(LOCAL_PATH)/src/XlibInt.c \
$(LOCAL_PATH)/src/Xrm.c \
LOCAL_SRCS := \
src/xcms/*.c \
src/xkb/*.c \
src/xlibi18n/*.c \
modules/im/ximcp/*.c \
modules/lc/def/*.c \
modules/lc/gen/*.c \
modules/lc/Utf8/*.c \
modules/lc/xlocale/*.c \
modules/om/generic/*.c \
LOCAL_SHARED_LIBRARIES := libXdmcp libXau android-shmem xcb
LOCAL_STATIC_LIBRARIES := android_support
LOCAL_SRC_FILES := \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
src/AllCells.c \
src/AllowEv.c \
src/AllPlanes.c \
src/AutoRep.c \
src/Backgnd.c \
src/BdrWidth.c \
src/Bell.c \
src/Border.c \
src/ChAccCon.c \
src/ChActPGb.c \
src/ChClMode.c \
src/ChCmap.c \
src/ChGC.c \
src/ChKeyCon.c \
src/ChkIfEv.c \
src/ChkMaskEv.c \
src/ChkTypEv.c \
src/ChkTypWEv.c \
src/ChkWinEv.c \
src/ChPntCon.c \
src/ChProp.c \
src/ChSaveSet.c \
src/ChWAttrs.c \
src/ChWindow.c \
src/CirWin.c \
src/CirWinDn.c \
src/CirWinUp.c \
src/ClDisplay.c \
src/ClearArea.c \
src/Clear.c \
src/ConfWind.c \
src/Context.c \
src/ConvSel.c \
src/CopyArea.c \
src/CopyCmap.c \
src/CopyGC.c \
src/CopyPlane.c \
src/CrBFData.c \
src/CrCmap.c \
src/CrCursor.c \
src/CrGC.c \
src/CrGlCur.c \
src/CrPFBData.c \
src/CrPixmap.c \
src/CrWindow.c \
src/Cursor.c \
src/DefCursor.c \
src/DelProp.c \
src/Depths.c \
src/DestSubs.c \
src/DestWind.c \
src/DisName.c \
src/DrArc.c \
src/DrArcs.c \
src/DrLine.c \
src/DrLines.c \
src/DrPoint.c \
src/DrPoints.c \
src/DrRect.c \
src/DrRects.c \
src/DrSegs.c \
src/ErrDes.c \
src/ErrHndlr.c \
src/evtomask.c \
src/EvToWire.c \
src/FetchName.c \
src/FillArc.c \
src/FillArcs.c \
src/FillPoly.c \
src/FillRct.c \
src/FillRcts.c \
src/FilterEv.c \
src/Flush.c \
src/Font.c \
src/FontInfo.c \
src/FontNames.c \
src/FreeCmap.c \
src/FreeCols.c \
src/FreeCurs.c \
src/FreeEData.c \
src/FreeEventData.c \
src/FreeGC.c \
src/FreePix.c \
src/FSSaver.c \
src/FSWrap.c \
src/GCMisc.c \
src/Geom.c \
src/GetAtomNm.c \
src/GetColor.c \
src/GetDflt.c \
src/GetEventData.c \
src/GetFPath.c \
src/GetFProp.c \
src/GetGCVals.c \
src/GetGeom.c \
src/GetHColor.c \
src/GetHints.c \
src/GetIFocus.c \
src/GetImage.c \
src/GetKCnt.c \
src/GetMoEv.c \
src/GetNrmHint.c \
src/GetPCnt.c \
src/GetPntMap.c \
src/GetProp.c \
src/GetRGBCMap.c \
src/GetSOwner.c \
src/GetSSaver.c \
src/GetStCmap.c \
src/GetTxtProp.c \
src/GetWAttrs.c \
src/GetWMCMapW.c \
src/GetWMProto.c \
src/globals.c \
src/GrButton.c \
src/GrKeybd.c \
src/GrKey.c \
src/GrPointer.c \
src/GrServer.c \
src/Host.c \
src/Iconify.c \
src/IfEvent.c \
src/imConv.c \
src/ImText16.c \
src/ImText.c \
src/ImUtil.c \
src/InitExt.c \
src/InsCmap.c \
src/IntAtom.c \
src/KeyBind.c \
src/KeysymStr.c \
src/KillCl.c \
src/LiHosts.c \
src/LiICmaps.c \
src/LiProps.c \
src/ListExt.c \
src/LoadFont.c \
src/LockDis.c \
src/locking.c \
src/LookupCol.c \
src/LowerWin.c \
src/Macros.c \
src/MapRaised.c \
src/MapSubs.c \
src/MapWindow.c \
src/MaskEvent.c \
src/Misc.c \
src/ModMap.c \
src/MoveWin.c \
src/NextEvent.c \
src/OCWrap.c \
src/OMWrap.c \
src/OpenDis.c \
src/ParseCmd.c \
src/ParseCol.c \
src/ParseGeom.c \
src/PeekEvent.c \
src/PeekIfEv.c \
src/Pending.c \
src/PixFormats.c \
src/PmapBgnd.c \
src/PmapBord.c \
src/PolyReg.c \
src/PolyTxt16.c \
src/PolyTxt.c \
src/PropAlloc.c \
src/PutBEvent.c \
src/PutImage.c \
src/Quarks.c \
src/QuBest.c \
src/QuColor.c \
src/QuColors.c \
src/QuCurShp.c \
src/QuExt.c \
src/QuKeybd.c \
src/QuPntr.c \
src/QuStipShp.c \
src/QuTextE16.c \
src/QuTextExt.c \
src/QuTileShp.c \
src/QuTree.c \
src/RaiseWin.c \
src/RdBitF.c \
src/RecolorC.c \
src/ReconfWin.c \
src/ReconfWM.c \
src/Region.c \
src/RegstFlt.c \
src/RepWindow.c \
src/RestackWs.c \
src/RotProp.c \
src/ScrResStr.c \
src/SelInput.c \
src/SendEvent.c \
src/SetBack.c \
src/SetClMask.c \
src/SetClOrig.c \
src/SetCRects.c \
src/SetDashes.c \
src/SetFont.c \
src/SetFore.c \
src/SetFPath.c \
src/SetFunc.c \
src/SetHints.c \
src/SetIFocus.c \
src/SetLocale.c \
src/SetLStyle.c \
src/SetNrmHint.c \
src/SetPMask.c \
src/SetPntMap.c \
src/SetRGBCMap.c \
src/SetSOwner.c \
src/SetSSaver.c \
src/SetState.c \
src/SetStCmap.c \
src/SetStip.c \
src/SetTile.c \
src/SetTSOrig.c \
src/SetTxtProp.c \
src/SetWMCMapW.c \
src/SetWMProto.c \
src/StBytes.c \
src/StColor.c \
src/StColors.c \
src/StName.c \
src/StNColor.c \
src/StrKeysym.c \
src/StrToText.c \
src/Sync.c \
src/Synchro.c \
src/Text16.c \
src/Text.c \
src/TextExt16.c \
src/TextExt.c \
src/TextToStr.c \
src/TrCoords.c \
src/UndefCurs.c \
src/UngrabBut.c \
src/UngrabKbd.c \
src/UngrabKey.c \
src/UngrabPtr.c \
src/UngrabSvr.c \
src/UninsCmap.c \
src/UnldFont.c \
src/UnmapSubs.c \
src/UnmapWin.c \
src/VisUtil.c \
src/WarpPtr.c \
src/Window.c \
src/WinEvent.c \
src/Withdraw.c \
src/WMGeom.c \
src/WMProps.c \
src/WrBitF.c \
src/xcb_disp.c \
src/xcb_io.c \
src/XlibAsync.c \
src/XlibInt.c \
src/Xrm.c \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := libXdmcp libXau libandroid-shmem libxcb
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz

10
jni/application/libX11-1.6.2/modules/im/ximcp/imTrans.c
View File

@@ -82,11 +82,11 @@ _XimTransConnect(
for (retry = XIM_CONNECTION_RETRIES; retry >= 0; retry--)
{
if ((spec->trans_conn = _XimXTransOpenCOTSClient (
spec->address)) == NULL)
{
break;
}
//if ((spec->trans_conn = _XimXTransOpenCOTSClient (
// spec->address)) == NULL)
//{
// break;
//}
if ((connect_stat = _XimXTransConnect (
spec->trans_conn, spec->address)) < 0)

20
jni/application/libXau-1.0.8/Android.mk
View File

@@ -7,23 +7,23 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXau
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRC_FILES := \
$(LOCAL_PATH)/AuDispose.c \
$(LOCAL_PATH)/AuFileName.c \
$(LOCAL_PATH)/AuGetAddr.c \
$(LOCAL_PATH)/AuGetBest.c \
$(LOCAL_PATH)/AuLock.c \
$(LOCAL_PATH)/AuRead.c \
$(LOCAL_PATH)/AuUnlock.c \
$(LOCAL_PATH)/AuWrite.c
AuDispose.c \
AuFileName.c \
AuGetAddr.c \
AuGetBest.c \
AuLock.c \
AuRead.c \
AuUnlock.c \
AuWrite.c
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES :=

24
jni/application/libXdmcp-1.1.1/Android.mk
View File

@@ -7,25 +7,25 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXdmcp
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRC_FILES := \
$(LOCAL_PATH)/Array.c \
$(LOCAL_PATH)/Fill.c \
$(LOCAL_PATH)/Flush.c \
$(LOCAL_PATH)/Key.c \
$(LOCAL_PATH)/Read.c \
$(LOCAL_PATH)/Unwrap.c \
$(LOCAL_PATH)/Wrap.c \
$(LOCAL_PATH)/Wrap.h \
$(LOCAL_PATH)/Write.c \
$(LOCAL_PATH)/Wraphelp.c
Array.c \
Fill.c \
Flush.c \
Key.c \
Read.c \
Unwrap.c \
Wrap.c \
Wrap.h \
Write.c \
Wraphelp.c
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES :=

12
jni/application/libXext-1.3.2/Android.mk
View File

@@ -7,19 +7,23 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXext
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRCS := \
src/*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz

57
jni/application/libXfont-1.4.6/Android.mk
View File

@@ -7,42 +7,45 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXfont
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
$(LOCAL_PATH) \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../../freetype/include \
external/XServer-XSDL-android-src/jni/freetype/include \
$(LOCAL_PATH)/src/stubs \
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DNOFILES_MAX=256 -DNO_LOCALE
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/bitmap/*.c) \
$(wildcard $(LOCAL_PATH)/src/builtins/*.c) \
$(wildcard $(LOCAL_PATH)/src/fc/*.c) \
$(wildcard $(LOCAL_PATH)/src/FreeType/*.c) \
$(wildcard $(LOCAL_PATH)/src/stubs/*.c) \
$(wildcard $(LOCAL_PATH)/src/util/*.c) \
$(LOCAL_PATH)/src/fontfile/bitsource.c \
$(LOCAL_PATH)/src/fontfile/bufio.c \
$(LOCAL_PATH)/src/fontfile/decompress.c \
$(LOCAL_PATH)/src/fontfile/defaults.c \
$(LOCAL_PATH)/src/fontfile/dirfile.c \
$(LOCAL_PATH)/src/fontfile/fileio.c \
$(LOCAL_PATH)/src/fontfile/filewr.c \
$(LOCAL_PATH)/src/fontfile/fontdir.c \
$(LOCAL_PATH)/src/fontfile/fontencc.c \
$(LOCAL_PATH)/src/fontfile/fontfile.c \
$(LOCAL_PATH)/src/fontfile/fontscale.c \
$(LOCAL_PATH)/src/fontfile/gunzip.c \
$(LOCAL_PATH)/src/fontfile/register.c \
$(LOCAL_PATH)/src/fontfile/renderers.c \
$(LOCAL_PATH)/src/fontfile/catalogue.c
LOCAL_SRCS := \
src/bitmap/*.c \
src/builtins/*.c \
src/fc/*.c \
src/FreeType/*.c \
src/stubs/*.c \
src/util/*.c \
LOCAL_SRC_FILES := \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
src/fontfile/bitsource.c \
src/fontfile/bufio.c \
src/fontfile/decompress.c \
src/fontfile/defaults.c \
src/fontfile/dirfile.c \
src/fontfile/fileio.c \
src/fontfile/filewr.c \
src/fontfile/fontdir.c \
src/fontfile/fontencc.c \
src/fontfile/fontfile.c \
src/fontfile/fontscale.c \
src/fontfile/gunzip.c \
src/fontfile/register.c \
src/fontfile/renderers.c \
src/fontfile/catalogue.c
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := freetype libfontenc
LOCAL_STATIC_LIBRARIES := libfreetype libfontenc
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz
include $(BUILD_STATIC_LIBRARY)
include $(BUILD_SHARED_LIBRARY)

12
jni/application/libXmu-1.1.2/Android.mk
View File

@@ -7,20 +7,24 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXmu
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/Xmu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRCS := \
src/*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11 Xext Xrender xkbfile ICE SM Xt
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender libxkbfile libICE libSM libXt
#LOCAL_LDFLAGS := -pie

12
jni/application/libXrandr-1.4.2/Android.mk
View File

@@ -7,20 +7,24 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXrandr
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/extensions \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRCS := \
src/*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11 Xext Xrender
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz

11
jni/application/libXrender-0.9.8/Android.mk
View File

@@ -7,20 +7,23 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXrender
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/extensions \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRCS := \
src/*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz

11
jni/application/libXt-1.1.4/Android.mk
View File

@@ -7,19 +7,22 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXt
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRCS := \
src/*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11 Xext Xrender xkbfile ICE SM
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender libxkbfile libICE libSM
#LOCAL_LDFLAGS := -pie

4
jni/application/libfontenc-1.1.2/Android.mk
View File

@@ -11,8 +11,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DFONT_ENCODINGS_DIRECTORY=\"/usr/share/fonts/X11/encodings/encodings.dir\"
LOCAL_SRC_FILES := \
$(LOCAL_PATH)/src/encparse.c \
$(LOCAL_PATH)/src/fontenc.c \
src/encparse.c \
src/fontenc.c \
LOCAL_STATIC_LIBRARIES :=

10
jni/application/libxcb-1.10/Android.mk
View File

@@ -7,16 +7,18 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libxcb
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
$(LOCAL_PATH) \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/src/
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
LOCAL_SRCS := \
src/*.c \
LOCAL_SRC_FILES := \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := libXdmcp libXau

11
jni/application/libxkbfile-1.0.8/Android.mk
View File

@@ -7,20 +7,23 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libxkbfile
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/extensions \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRCS := \
src/*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11 Xext Xrender
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz

2
jni/application/libxkbfile-1.0.8/src/cout.c
View File

@@ -45,7 +45,7 @@ WriteCHdrVMods(FILE *file,Display *dpy,XkbDescPtr xkb)
{
register int i,nOut;
if ((!xkb)||(!xkb->names)||(!xkb->names->vmods))
if ((!xkb)||(!xkb->names))//||(!xkb->names->vmods))
return False;
for (i=nOut=0;i<XkbNumVirtualMods;i++) {
if (xkb->names->vmods[i]!=None) {

26
jni/application/pixman-0.30.2/Android.mk
View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
#LOCAL_SDK_VERSION := 14
LOCAL_MODULE := pixman-1
LOCAL_MODULE := libpixman-1
LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \
@@ -16,45 +16,39 @@ LOCAL_SRC_FILES := \
pixman/pixman.c \
pixman/pixman-access.c \
pixman/pixman-access-accessors.c \
pixman/pixman-arm.c \
pixman/pixman-arm-neon.c \
pixman/pixman-arm-neon-asm.S \
pixman/pixman-arm-neon-asm-bilinear.S \
pixman/pixman-arm-simd.c \
pixman/pixman-arm-simd-asm.S \
pixman/pixman-arm-simd-asm-scaled.S \
pixman/pixman-bits-image.c \
pixman/pixman-combine32.c \
pixman/pixman-combine-float.c \
pixman/pixman-conical-gradient.c \
pixman/pixman-filter.c \
pixman/pixman-x86.c \
pixman/pixman-mips.c \
pixman/pixman-arm.c \
pixman/pixman-ppc.c \
pixman/pixman-edge.c \
pixman/pixman-edge-accessors.c \
pixman/pixman-fast-path.c \
pixman/pixman-filter.c \
pixman/pixman-general.c \
pixman/pixman-glyph.c \
pixman/pixman-general.c \
pixman/pixman-gradient-walker.c \
pixman/pixman-image.c \
pixman/pixman-implementation.c \
pixman/pixman-linear-gradient.c \
pixman/pixman-matrix.c \
pixman/pixman-mips.c \
pixman/pixman-noop.c \
pixman/pixman-ppc.c \
pixman/pixman-radial-gradient.c \
pixman/pixman-region16.c \
pixman/pixman-region32.c \
pixman/pixman-solid-fill.c \
pixman/pixman-timer.c \
pixman/pixman-trap.c \
pixman/pixman-utils.c \
pixman/pixman-x86.c \
pixman/pixman-utils.c
LOCAL_STATIC_LIBRARIES := cpufeatures
LOCAL_STATIC_LIBRARIES :=
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz
include $(BUILD_STATIC_LIBRARY)
$(call import-module,android/cpufeatures)

4
jni/application/pixman-0.30.2/config.h
View File

@@ -123,10 +123,10 @@
/* #undef USE_ARM_IWMMXT */
/* use ARM NEON assembly optimizations */
#define USE_ARM_NEON 1
//#define USE_ARM_NEON 1
/* use ARM SIMD assembly optimizations */
#define USE_ARM_SIMD 1
//#define USE_ARM_SIMD 1
/* use GNU-style inline assembler */
#define USE_GCC_INLINE_ASM 1

8
jni/application/pixman-0.30.2/pixman/pixman-arm.c
View File

@@ -94,10 +94,10 @@ detect_cpu_features (void)
return features;
}
#elif defined(__ANDROID__) || defined(ANDROID) /* Android */
#include <cpu-features.h>
//#elif defined(__ANDROID__) || defined(ANDROID) /* Android */
//#include <cpu-features.h>
/*
static arm_cpu_features_t
detect_cpu_features (void)
{
@@ -122,7 +122,7 @@ detect_cpu_features (void)
return features;
}
*/
#elif defined (__linux__) /* linux ELF */
#include <unistd.h>

10
jni/application/xhost-1.0.6/Android.mk
View File

@@ -7,16 +7,20 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := xhost
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H -Dsethostent=abs -Dendhostent=sync
LOCAL_SRCS := \
*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11 Xext Xrender xkbfile ICE SM Xt Xmu
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender libxkbfile libICE libSM libXt libXmu
LOCAL_LDFLAGS := -pie

11
jni/application/xkbcomp-1.2.4/Android.mk
View File

@@ -7,20 +7,23 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := xkbcomp
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/extensions \
$(LOCAL_PATH) \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H
LOCAL_SRCS := \
*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11 Xext Xrender xkbfile
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender libxkbfile
LOCAL_LDFLAGS := -pie

96
jni/application/xli-1.16/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := xli
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H -Drindex=strchr -include strings.h \
@@ -18,55 +18,55 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -Drindex=strchr -include strings.h \
-Os
LOCAL_SRC_FILES := \
$(LOCAL_PATH)/bright.c \
$(LOCAL_PATH)/clip.c \
$(LOCAL_PATH)/cmuwmrast.c \
$(LOCAL_PATH)/compress.c \
$(LOCAL_PATH)/dither.c \
$(LOCAL_PATH)/faces.c \
$(LOCAL_PATH)/fbm.c \
$(LOCAL_PATH)/fill.c \
$(LOCAL_PATH)/g3.c \
$(LOCAL_PATH)/gif.c \
$(LOCAL_PATH)/halftone.c \
$(LOCAL_PATH)/imagetypes.c \
$(LOCAL_PATH)/img.c \
$(LOCAL_PATH)/mac.c \
$(LOCAL_PATH)/mcidas.c \
$(LOCAL_PATH)/mc_tables.c \
$(LOCAL_PATH)/merge.c \
$(LOCAL_PATH)/misc.c \
$(LOCAL_PATH)/new.c \
$(LOCAL_PATH)/options.c \
$(LOCAL_PATH)/path.c \
$(LOCAL_PATH)/pbm.c \
$(LOCAL_PATH)/pcx.c \
$(LOCAL_PATH)/reduce.c \
$(LOCAL_PATH)/jpeg.c \
$(LOCAL_PATH)/jpeglib.c \
$(LOCAL_PATH)/rle.c \
$(LOCAL_PATH)/rlelib.c \
$(LOCAL_PATH)/root.c \
$(LOCAL_PATH)/rotate.c \
$(LOCAL_PATH)/send.c \
$(LOCAL_PATH)/smooth.c \
$(LOCAL_PATH)/sunraster.c \
$(LOCAL_PATH)/value.c \
$(LOCAL_PATH)/window.c \
$(LOCAL_PATH)/xbitmap.c \
$(LOCAL_PATH)/xli.c \
$(LOCAL_PATH)/xpixmap.c \
$(LOCAL_PATH)/xwd.c \
$(LOCAL_PATH)/zio.c \
$(LOCAL_PATH)/zoom.c \
$(LOCAL_PATH)/ddxli.c \
$(LOCAL_PATH)/doslib.c \
$(LOCAL_PATH)/tga.c \
$(LOCAL_PATH)/bmp.c \
$(LOCAL_PATH)/pcd.c
bright.c \
clip.c \
cmuwmrast.c \
compress.c \
dither.c \
faces.c \
fbm.c \
fill.c \
g3.c \
gif.c \
halftone.c \
imagetypes.c \
img.c \
mac.c \
mcidas.c \
mc_tables.c \
merge.c \
misc.c \
new.c \
options.c \
path.c \
pbm.c \
pcx.c \
reduce.c \
jpeg.c \
jpeglib.c \
rle.c \
rlelib.c \
root.c \
rotate.c \
send.c \
smooth.c \
sunraster.c \
value.c \
window.c \
xbitmap.c \
xli.c \
xpixmap.c \
xwd.c \
zio.c \
zoom.c \
ddxli.c \
doslib.c \
tga.c \
bmp.c \
pcd.c
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11 Xext Xrender xkbfile ICE SM Xt Xmu
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender libxkbfile libICE libSM libXt libXmu
LOCAL_LDFLAGS := -pie

9
jni/application/xsel-master/Android.mk
View File

@@ -7,17 +7,20 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := xsel
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
LOCAL_CFLAGS := -DHAVE_CONFIG_H -Drpl_malloc=malloc
LOCAL_SRCS := \
*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/*.c) \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := android_support xcb Xau Xdmcp X11 Xext Xrender xkbfile ICE SM Xt Xmu
LOCAL_STATIC_LIBRARIES := libxcb libXau libXdmcp libX11 libXext libXrender libxkbfile libICE libSM libXt libXmu
LOCAL_LDFLAGS := -pie

104
jni/application/xserver/Android.mk
View File

@@ -7,12 +7,14 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libapplication
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../header/include \
external/XServer-XSDL-android-src/jni/application/header/include \
external/XServer-XSDL-android-src/jni/sdl-1.2/include \
external/XServer-XSDL-android-src/jni/sdl_ttf/include \
external/XServer-XSDL-android-src/jni/application/pixman-0.30.2/pixman \
external/XServer-XSDL-android-src/jni/application/android-shmem \
external/boringssl/include \
$(LOCAL_PATH)/xserver/include \
$(LOCAL_PATH)/../../sdl-1.2/include \
$(LOCAL_PATH)/../../sdl_ttf/include \
$(LOCAL_PATH)/xserver/hw/kdrive/src \
$(LOCAL_PATH)/../pixman-0.30.2/pixman \
$(LOCAL_PATH)/xserver/Xext \
$(LOCAL_PATH)/xserver/dix \
$(LOCAL_PATH)/xserver/fb \
@@ -48,55 +50,59 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H \
LOCAL_SRCS := \
*.c \
xserver/src/*.c \
xserver/hw/kdrive/sdl/*.c \
xserver/dix/*.c \
xserver/hw/kdrive/src/*.c \
xserver/fb/*.c \
xserver/mi/*.c \
xserver/xfixes/*.c \
xserver/dbe/*.c \
xserver/record/*.c \
xserver/randr/*.c \
xserver/render/*.c \
xserver/damageext/*.c \
xserver/miext/sync/*.c \
xserver/miext/damage/*.c \
xserver/miext/shadow/*.c \
xserver/Xi/*.c \
xserver/xkb/*.c \
xserver/composite/*.c \
xserver/os/*.c \
xserver/hw/kdrive/linux/*.c \
LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/src/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/hw/kdrive/sdl/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/dix/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/hw/kdrive/src/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/fb/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/mi/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/xfixes/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/dbe/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/record/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/randr/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/render/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/damageext/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/miext/sync/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/miext/damage/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/miext/shadow/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/Xi/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/xkb/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/composite/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/os/*.c) \
$(wildcard $(LOCAL_PATH)/xserver/hw/kdrive/linux/*.c) \
$(LOCAL_PATH)/xserver/Xext/bigreq.c \
$(LOCAL_PATH)/xserver/Xext/dpms.c \
$(LOCAL_PATH)/xserver/Xext/geext.c \
$(LOCAL_PATH)/xserver/Xext/panoramiX.c \
$(LOCAL_PATH)/xserver/Xext/panoramiXprocs.c \
$(LOCAL_PATH)/xserver/Xext/panoramiXSwap.c \
$(LOCAL_PATH)/xserver/Xext/saver.c \
$(LOCAL_PATH)/xserver/Xext/shape.c \
$(LOCAL_PATH)/xserver/Xext/shm.c \
$(LOCAL_PATH)/xserver/Xext/sleepuntil.c \
$(LOCAL_PATH)/xserver/Xext/sync.c \
$(LOCAL_PATH)/xserver/Xext/xace.c \
$(LOCAL_PATH)/xserver/Xext/xcmisc.c \
$(LOCAL_PATH)/xserver/Xext/xres.c \
$(LOCAL_PATH)/xserver/Xext/xtest.c \
$(LOCAL_PATH)/xserver/Xext/xvdisp.c \
$(LOCAL_PATH)/xserver/Xext/xvmain.c \
$(LOCAL_PATH)/xserver/Xext/xvmc.c \
xserver/Xext/bigreq.c \
xserver/Xext/dpms.c \
xserver/Xext/geext.c \
xserver/Xext/panoramiX.c \
xserver/Xext/panoramiXprocs.c \
xserver/Xext/panoramiXSwap.c \
xserver/Xext/saver.c \
xserver/Xext/shape.c \
xserver/Xext/shm.c \
xserver/Xext/sleepuntil.c \
xserver/Xext/sync.c \
xserver/Xext/xace.c \
xserver/Xext/xcmisc.c \
xserver/Xext/xres.c \
xserver/Xext/xtest.c \
xserver/Xext/xvdisp.c \
xserver/Xext/xvmain.c \
xserver/Xext/xvmc.c \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
# $(wildcard $(LOCAL_PATH)/xserver/Xext/*.c) \
# $(wildcard xserver/Xext/*.c) \
LOCAL_SHARED_LIBRARIES := sdl-1.2 sdl_ttf
LOCAL_SHARED_LIBRARIES := libsdl-1.2 libsdl_ttf libXfont
LOCAL_STATIC_LIBRARIES := android_support freetype xcb \
Xau Xdmcp X11 Xext Xrender xkbfile \
ICE fontenc android-shmem Xfont pixman-1
LOCAL_STATIC_LIBRARIES := libxcb \
libXau libXdmcp libX11 libXext libXrender libxkbfile \
libICE libfontenc libandroid-shmem libpixman-1 \
libcrypto_static
#LOCAL_LDFLAGS := -pie
@@ -104,4 +110,4 @@ LOCAL_LDLIBS := -llog -lc -lm -ldl -lz -lGLESv1_CM
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/support)
#$(call import-module,android/support)

2
jni/application/xserver/xserver/include/dix-config.h
View File

@@ -162,7 +162,7 @@
/* #undef HAVE_RPCSVC_DBM_H */
/* Define to use libc SHA1 functions */
#define HAVE_SHA1_IN_LIBC 1
//#define HAVE_SHA1_IN_LIBC 1
/* Define to use CommonCrypto SHA1 functions */
/* #undef HAVE_SHA1_IN_COMMONCRYPTO */

7
jni/freetype/Android.mk
View File

@@ -2,11 +2,14 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := freetype
LOCAL_MODULE := libfreetype
APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include \
external/libpng \
external/zlib
LOCAL_CFLAGS := -O2 -DFT2_BUILD_LIBRARY

4
jni/freetype/src/base/ftobjs.c
View File

@@ -745,11 +745,11 @@
else if ( slot->format == FT_GLYPH_FORMAT_OUTLINE )
{
/* apply `standard' transformation if no renderer is available */
if ( &internal->transform_matrix )
//if ( &internal->transform_matrix )
FT_Outline_Transform( &slot->outline,
&internal->transform_matrix );
if ( &internal->transform_delta )
// if ( &internal->transform_delta )
FT_Outline_Translate( &slot->outline,
internal->transform_delta.x,
internal->transform_delta.y );

2
jni/jpeg/Android.mk
View File

@@ -33,6 +33,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS += -DAVOID_TABLES
LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
LOCAL_MODULE:= jpeg
LOCAL_MODULE:= libjpeg
include $(BUILD_STATIC_LIBRARY)

4
jni/ndk/Android.mk Normal file
View File

@@ -0,0 +1,4 @@
#include ndk/sources/android/cpufeatures/Android.mk
#include ndk/sources/android/support/Android.mk

4
jni/ogg/AUTHORS
View File

@@ -1,4 +0,0 @@
Monty <monty@xiph.org>
and the rest of the Xiph.Org Foundation.

22
jni/ogg/Android.mk
View File

@@ -1,22 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := ogg
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -O3
LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := $(addprefix src/, $(notdir $(wildcard $(LOCAL_PATH)/src/*.c) $(wildcard $(LOCAL_PATH)/src/*.cpp)))
LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES :=
LOCAL_LDLIBS :=
include $(BUILD_STATIC_LIBRARY)

49
jni/ogg/CHANGES
View File

@@ -1,49 +0,0 @@
Version 1.2.0 (2010 March 25)
* Alter default flushing behavior to span less often and use larger page
sizes when packet sizes are large.
* Build fixes for additional compilers
* Documentation updates
Version 1.1.4 (2009 June 24)
* New async error reporting mechanism. Calls made after a fatal error are
now safely handled in the event an error code is ignored
* Added allocation checks useful to some embedded applications
* fix possible read past end of buffer when reading 0 bits
* Updates to API documentation
* Build fixes
Version 1.1.3 (2005 November 27)
* Correct a bug in the granulepos field of pages where no packet ends
* New VS2003 and XCode builds, minor fixes to other builds
* documentation fixes and cleanup
Version 1.1.2 (2004 September 23)
* fix a bug with multipage packet assembly after seek
Version 1.1.1 (2004 September 12)
* various bugfixes
* important bugfix for 64-bit platforms
* various portability fixes
* autotools cleanup from Thomas Vander Stichele
* Symbian OS build support from Colin Ward at CSIRO
* new multiplexed Ogg stream documentation
Version 1.1 (2003 November 17)
* big-endian bitpacker routines for Theora
* various portability fixes
* improved API documenation
* RFC 3533 documentation of the format by Silvia Pfeiffer at CSIRO
* RFC 3534 documentation of the application/ogg mime-type by Linus Walleij
Version 1.0 (2002 July 19)
* First stable release
* little-endian bitpacker routines for Vorbis
* basic Ogg bitstream sync and coding support

28
jni/ogg/COPYING
View File

@@ -1,28 +0,0 @@
Copyright (c) 2002, Xiph.org Foundation
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name of the Xiph.org Foundation nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

133
jni/ogg/README
View File

@@ -1,133 +0,0 @@
********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
WHAT'S HERE:
This source distribution includes libogg and nothing else. Other modules
(eg, the modules vorbis, vorbis-tools and vorbis-plugins for the Vorbis
codec) contain the codec libraries for use with Ogg bitstreams.
Directory:
./src The source for libogg, a BSD-license inplementation of
the public domain Ogg bitstream format
./include Library API headers and codebooks
./doc Ogg specification documents
./win32 Win32 projects and build automation
./macosx MacOS X project and build files
./macos Classic MacOS 9 projects and build automation
./debian Rules/spec files for building Debian .deb packages
(may not be present, depending on your distribution)
WHAT IS OGG?:
Ogg project codecs use the Ogg bitstream format to arrange the raw,
compressed bitstream into a more robust, useful form. For example,
the Ogg bitstream makes seeking, time stamping and error recovery
possible, as well as mixing several sepearate, concurrent media
streams into a single physical bitstream.
CONTACT:
The Ogg homepage is located at 'http://www.xiph.org/ogg/'.
Up to date technical documents, contact information, source code and
pre-built utilities may be found there.
BUILDING FROM REPOSITORY SOURCE:
A standard svn build should consist of nothing more than:
./autogen.sh
make
and as root if desired :
make install
This will install the Ogg libraries (static and shared) into
/usr/local/lib, includes into /usr/local/include and API manpages
(once we write some) into /usr/local/man.
BUILDING FROM TARBALL DISTRIBUTIONS:
./configure
make
and optionally (as root):
make install
BUILDING RPMS:
RPMs may be built by:
make dist
rpm -ta libogg-<version>.tar.gz
BUILDING ON WIN32:
Use the project file in the win32 directory. It should compile out of the box.
You can also run one of the batch files from the commandline.
E.g.: build_ogg_dynamic
CROSS COMPILING FROM LINUX TO WIN32:
It is also possible to cross compile from Linux to windows using the MinGW
cross tools and even to run the test suite under Wine, the Linux/*nix
windows emulator.
On Debian and Ubuntu systems, these cross compiler tools can be installed
by doing:
sudo apt-get mingw32 mingw32-binutils mingw32-runtime wine
Once these tools are installed its possible to compile and test by
executing the following commands:
./configure --host=i586-mingw32msvc --target=i586-mingw32msvc \
--build=i586-linux
make
make check
The above has been tested with the following versions of the tools on
Ubuntu's Hardy Heron release:
mingw32 4.2.1.dfsg-1ubuntu1
mingw32-binutils 2.17.50-20070129.1-1
mingw32-runtime 3.13-1
wine 0.9.59-0ubuntu4
BUILDING ON MACOS 9:
Ogg on MacOS 9 is built using CodeWarrior 5.3. To build it, first
open ogg/mac/libogg.mcp, switch to the "Targets" pane, select
everything, and make the project. In ogg/mac/Output you will now have
both debug and final versions of Ogg shared libraries to link your
projects against.
To build a project using Ogg, add access paths to your CodeWarrior
project for the ogg/include and ogg/mac/Output folders. Be sure that
"interpret DOS and Unix paths" is turned on in your project; it can be
found in the "access paths" pane in your project settings. Now simply
add the shared libraries you need to your project (OggLib at least)
and #include "ogg/ogg.h" wherever you need to acces Ogg functionality.
(Build instructions for Ogg codecs such as vorbis are similar and may
be found in those source modules' README files)
$Id: README 14726 2008-04-14 08:40:46Z erikd $

11
jni/ogg/include/ogg/config_types.h
View File

@@ -1,11 +0,0 @@
#ifndef __CONFIG_TYPES_H__
#define __CONFIG_TYPES_H__
/* these are filled in by configure */
typedef short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
typedef int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef long long ogg_int64_t;
#endif

208
jni/ogg/include/ogg/ogg.h
View File

@@ -1,208 +0,0 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: toplevel libogg include
last mod: $Id: ogg.h 16051 2009-05-27 05:00:06Z xiphmont $
********************************************************************/
#ifndef _OGG_H
#define _OGG_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stddef.h>
#include <ogg/os_types.h>
typedef struct {
void *iov_base;
size_t iov_len;
} ogg_iovec_t;
typedef struct {
long endbyte;
int endbit;
unsigned char *buffer;
unsigned char *ptr;
long storage;
} oggpack_buffer;
/* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/
typedef struct {
unsigned char *header;
long header_len;
unsigned char *body;
long body_len;
} ogg_page;
/* ogg_stream_state contains the current encode/decode state of a logical
Ogg bitstream **********************************************************/
typedef struct {
unsigned char *body_data; /* bytes from packet bodies */
long body_storage; /* storage elements allocated */
long body_fill; /* elements stored; fill mark */
long body_returned; /* elements of fill returned */
int *lacing_vals; /* The values that will go to the segment table */
ogg_int64_t *granule_vals; /* granulepos values for headers. Not compact
this way, but it is simple coupled to the
lacing fifo */
long lacing_storage;
long lacing_fill;
long lacing_packet;
long lacing_returned;
unsigned char header[282]; /* working space for header encode */
int header_fill;
int e_o_s; /* set when we have buffered the last packet in the
logical bitstream */
int b_o_s; /* set after we've written the initial page
of a logical bitstream */
long serialno;
long pageno;
ogg_int64_t packetno; /* sequence number for decode; the framing
knows where there's a hole in the data,
but we need coupling so that the codec
(which is in a seperate abstraction
layer) also knows about the gap */
ogg_int64_t granulepos;
} ogg_stream_state;
/* ogg_packet is used to encapsulate the data and metadata belonging
to a single raw Ogg/Vorbis packet *************************************/
typedef struct {
unsigned char *packet;
long bytes;
long b_o_s;
long e_o_s;
ogg_int64_t granulepos;
ogg_int64_t packetno; /* sequence number for decode; the framing
knows where there's a hole in the data,
but we need coupling so that the codec
(which is in a seperate abstraction
layer) also knows about the gap */
} ogg_packet;
typedef struct {
unsigned char *data;
int storage;
int fill;
int returned;
int unsynced;
int headerbytes;
int bodybytes;
} ogg_sync_state;
/* Ogg BITSTREAM PRIMITIVES: bitstream ************************/
extern void oggpack_writeinit(oggpack_buffer *b);
extern int oggpack_writecheck(oggpack_buffer *b);
extern void oggpack_writetrunc(oggpack_buffer *b,long bits);
extern void oggpack_writealign(oggpack_buffer *b);
extern void oggpack_writecopy(oggpack_buffer *b,void *source,long bits);
extern void oggpack_reset(oggpack_buffer *b);
extern void oggpack_writeclear(oggpack_buffer *b);
extern void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
extern void oggpack_write(oggpack_buffer *b,unsigned long value,int bits);
extern long oggpack_look(oggpack_buffer *b,int bits);
extern long oggpack_look1(oggpack_buffer *b);
extern void oggpack_adv(oggpack_buffer *b,int bits);
extern void oggpack_adv1(oggpack_buffer *b);
extern long oggpack_read(oggpack_buffer *b,int bits);
extern long oggpack_read1(oggpack_buffer *b);
extern long oggpack_bytes(oggpack_buffer *b);
extern long oggpack_bits(oggpack_buffer *b);
extern unsigned char *oggpack_get_buffer(oggpack_buffer *b);
extern void oggpackB_writeinit(oggpack_buffer *b);
extern int oggpackB_writecheck(oggpack_buffer *b);
extern void oggpackB_writetrunc(oggpack_buffer *b,long bits);
extern void oggpackB_writealign(oggpack_buffer *b);
extern void oggpackB_writecopy(oggpack_buffer *b,void *source,long bits);
extern void oggpackB_reset(oggpack_buffer *b);
extern void oggpackB_writeclear(oggpack_buffer *b);
extern void oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
extern void oggpackB_write(oggpack_buffer *b,unsigned long value,int bits);
extern long oggpackB_look(oggpack_buffer *b,int bits);
extern long oggpackB_look1(oggpack_buffer *b);
extern void oggpackB_adv(oggpack_buffer *b,int bits);
extern void oggpackB_adv1(oggpack_buffer *b);
extern long oggpackB_read(oggpack_buffer *b,int bits);
extern long oggpackB_read1(oggpack_buffer *b);
extern long oggpackB_bytes(oggpack_buffer *b);
extern long oggpackB_bits(oggpack_buffer *b);
extern unsigned char *oggpackB_get_buffer(oggpack_buffer *b);
/* Ogg BITSTREAM PRIMITIVES: encoding **************************/
extern int ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
extern int ogg_stream_iovecin(ogg_stream_state *os, ogg_iovec_t *iov,
int count, long e_o_s, ogg_int64_t granulepos);
extern int ogg_stream_pageout(ogg_stream_state *os, ogg_page *og);
extern int ogg_stream_flush(ogg_stream_state *os, ogg_page *og);
/* Ogg BITSTREAM PRIMITIVES: decoding **************************/
extern int ogg_sync_init(ogg_sync_state *oy);
extern int ogg_sync_clear(ogg_sync_state *oy);
extern int ogg_sync_reset(ogg_sync_state *oy);
extern int ogg_sync_destroy(ogg_sync_state *oy);
extern int ogg_sync_check(ogg_sync_state *oy);
extern char *ogg_sync_buffer(ogg_sync_state *oy, long size);
extern int ogg_sync_wrote(ogg_sync_state *oy, long bytes);
extern long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og);
extern int ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og);
extern int ogg_stream_pagein(ogg_stream_state *os, ogg_page *og);
extern int ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op);
extern int ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op);
/* Ogg BITSTREAM PRIMITIVES: general ***************************/
extern int ogg_stream_init(ogg_stream_state *os,int serialno);
extern int ogg_stream_clear(ogg_stream_state *os);
extern int ogg_stream_reset(ogg_stream_state *os);
extern int ogg_stream_reset_serialno(ogg_stream_state *os,int serialno);
extern int ogg_stream_destroy(ogg_stream_state *os);
extern int ogg_stream_check(ogg_stream_state *os);
extern int ogg_stream_eos(ogg_stream_state *os);
extern void ogg_page_checksum_set(ogg_page *og);
extern int ogg_page_version(const ogg_page *og);
extern int ogg_page_continued(const ogg_page *og);
extern int ogg_page_bos(const ogg_page *og);
extern int ogg_page_eos(const ogg_page *og);
extern ogg_int64_t ogg_page_granulepos(const ogg_page *og);
extern int ogg_page_serialno(const ogg_page *og);
extern long ogg_page_pageno(const ogg_page *og);
extern int ogg_page_packets(const ogg_page *og);
extern void ogg_packet_clear(ogg_packet *op);
#ifdef __cplusplus
}
#endif
#endif /* _OGG_H */

148
jni/ogg/include/ogg/os_types.h
View File

@@ -1,148 +0,0 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
last mod: $Id: os_types.h 16649 2009-10-25 00:49:58Z ds $
********************************************************************/
#ifndef _OS_TYPES_H
#define _OS_TYPES_H
/* make it easy on the folks that want to compile the libs with a
different malloc than stdlib */
#define _ogg_malloc malloc
#define _ogg_calloc calloc
#define _ogg_realloc realloc
#define _ogg_free free
#if defined(_WIN32)
# if defined(__CYGWIN__)
# include <stdint.h>
typedef int16_t ogg_int16_t;
typedef uint16_t ogg_uint16_t;
typedef int32_t ogg_int32_t;
typedef uint32_t ogg_uint32_t;
typedef int64_t ogg_int64_t;
typedef uint64_t ogg_uint64_t;
# elif defined(__MINGW32__)
# include <sys/types.h>
typedef short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
typedef int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef long long ogg_int64_t;
typedef unsigned long long ogg_uint64_t;
# elif defined(__MWERKS__)
typedef long long ogg_int64_t;
typedef int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
# else
/* MSVC/Borland */
typedef __int64 ogg_int64_t;
typedef __int32 ogg_int32_t;
typedef unsigned __int32 ogg_uint32_t;
typedef __int16 ogg_int16_t;
typedef unsigned __int16 ogg_uint16_t;
# endif
#elif defined(__MACOS__)
# include <sys/types.h>
typedef SInt16 ogg_int16_t;
typedef UInt16 ogg_uint16_t;
typedef SInt32 ogg_int32_t;
typedef UInt32 ogg_uint32_t;
typedef SInt64 ogg_int64_t;
#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
# include <sys/types.h>
typedef int16_t ogg_int16_t;
typedef u_int16_t ogg_uint16_t;
typedef int32_t ogg_int32_t;
typedef u_int32_t ogg_uint32_t;
typedef int64_t ogg_int64_t;
#elif defined(__HAIKU__)
/* Haiku */
# include <sys/types.h>
typedef short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
typedef int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef long long ogg_int64_t;
#elif defined(__BEOS__)
/* Be */
# include <inttypes.h>
typedef int16_t ogg_int16_t;
typedef u_int16_t ogg_uint16_t;
typedef int32_t ogg_int32_t;
typedef u_int32_t ogg_uint32_t;
typedef int64_t ogg_int64_t;
#elif defined (__EMX__)
/* OS/2 GCC */
typedef short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
typedef int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef long long ogg_int64_t;
#elif defined (DJGPP)
/* DJGPP */
typedef short ogg_int16_t;
typedef int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef long long ogg_int64_t;
#elif defined(R5900)
/* PS2 EE */
typedef long ogg_int64_t;
typedef int ogg_int32_t;
typedef unsigned ogg_uint32_t;
typedef short ogg_int16_t;
#elif defined(__SYMBIAN32__)
/* Symbian GCC */
typedef signed short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
typedef signed int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef long long int ogg_int64_t;
#elif defined(__TMS320C6X__)
/* TI C64x compiler */
typedef signed short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
typedef signed int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef long long int ogg_int64_t;
#else
# include <sys/types.h>
# include <ogg/config_types.h>
#endif
#endif /* _OS_TYPES_H */

822
jni/ogg/src/bitwise.c
View File

@@ -1,822 +0,0 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE Ogg CONTAINER SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: packing variable sized words into an octet stream
last mod: $Id: bitwise.c 16993 2010-03-21 23:15:46Z xiphmont $
********************************************************************/
/* We're 'LSb' endian; if we write a word but read individual bits,
then we'll read the lsb first */
#include <string.h>
#include <stdlib.h>
#include <ogg/ogg.h>
#define BUFFER_INCREMENT 256
static const unsigned long mask[]=
{0x00000000,0x00000001,0x00000003,0x00000007,0x0000000f,
0x0000001f,0x0000003f,0x0000007f,0x000000ff,0x000001ff,
0x000003ff,0x000007ff,0x00000fff,0x00001fff,0x00003fff,
0x00007fff,0x0000ffff,0x0001ffff,0x0003ffff,0x0007ffff,
0x000fffff,0x001fffff,0x003fffff,0x007fffff,0x00ffffff,
0x01ffffff,0x03ffffff,0x07ffffff,0x0fffffff,0x1fffffff,
0x3fffffff,0x7fffffff,0xffffffff };
static const unsigned int mask8B[]=
{0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff};
void oggpack_writeinit(oggpack_buffer *b){
memset(b,0,sizeof(*b));
b->ptr=b->buffer=_ogg_malloc(BUFFER_INCREMENT);
b->buffer[0]='\0';
b->storage=BUFFER_INCREMENT;
}
void oggpackB_writeinit(oggpack_buffer *b){
oggpack_writeinit(b);
}
int oggpack_writecheck(oggpack_buffer *b){
if(!b->ptr || !b->storage)return -1;
return 0;
}
int oggpackB_writecheck(oggpack_buffer *b){
return oggpack_writecheck(b);
}
void oggpack_writetrunc(oggpack_buffer *b,long bits){
long bytes=bits>>3;
if(b->ptr){
bits-=bytes*8;
b->ptr=b->buffer+bytes;
b->endbit=bits;
b->endbyte=bytes;
*b->ptr&=mask[bits];
}
}
void oggpackB_writetrunc(oggpack_buffer *b,long bits){
long bytes=bits>>3;
if(b->ptr){
bits-=bytes*8;
b->ptr=b->buffer+bytes;
b->endbit=bits;
b->endbyte=bytes;
*b->ptr&=mask8B[bits];
}
}
/* Takes only up to 32 bits. */
void oggpack_write(oggpack_buffer *b,unsigned long value,int bits){
if(b->endbyte+4>=b->storage){
void *ret;
if(!b->ptr)return;
ret=_ogg_realloc(b->buffer,b->storage+BUFFER_INCREMENT);
if(!ret){
oggpack_writeclear(b);
return;
}
b->buffer=ret;
b->storage+=BUFFER_INCREMENT;
b->ptr=b->buffer+b->endbyte;
}
value&=mask[bits];
bits+=b->endbit;
b->ptr[0]|=value<<b->endbit;
if(bits>=8){
b->ptr[1]=(unsigned char)(value>>(8-b->endbit));
if(bits>=16){
b->ptr[2]=(unsigned char)(value>>(16-b->endbit));
if(bits>=24){
b->ptr[3]=(unsigned char)(value>>(24-b->endbit));
if(bits>=32){
if(b->endbit)
b->ptr[4]=(unsigned char)(value>>(32-b->endbit));
else
b->ptr[4]=0;
}
}
}
}
b->endbyte+=bits/8;
b->ptr+=bits/8;
b->endbit=bits&7;
}
/* Takes only up to 32 bits. */
void oggpackB_write(oggpack_buffer *b,unsigned long value,int bits){
if(b->endbyte+4>=b->storage){
void *ret;
if(!b->ptr)return;
ret=_ogg_realloc(b->buffer,b->storage+BUFFER_INCREMENT);
if(!ret){
oggpack_writeclear(b);
return;
}
b->buffer=ret;
b->storage+=BUFFER_INCREMENT;
b->ptr=b->buffer+b->endbyte;
}
value=(value&mask[bits])<<(32-bits);
bits+=b->endbit;
b->ptr[0]|=value>>(24+b->endbit);
if(bits>=8){
b->ptr[1]=(unsigned char)(value>>(16+b->endbit));
if(bits>=16){
b->ptr[2]=(unsigned char)(value>>(8+b->endbit));
if(bits>=24){
b->ptr[3]=(unsigned char)(value>>(b->endbit));
if(bits>=32){
if(b->endbit)
b->ptr[4]=(unsigned char)(value<<(8-b->endbit));
else
b->ptr[4]=0;
}
}
}
}
b->endbyte+=bits/8;
b->ptr+=bits/8;
b->endbit=bits&7;
}
void oggpack_writealign(oggpack_buffer *b){
int bits=8-b->endbit;
if(bits<8)
oggpack_write(b,0,bits);
}
void oggpackB_writealign(oggpack_buffer *b){
int bits=8-b->endbit;
if(bits<8)
oggpackB_write(b,0,bits);
}
static void oggpack_writecopy_helper(oggpack_buffer *b,
void *source,
long bits,
void (*w)(oggpack_buffer *,
unsigned long,
int),
int msb){
unsigned char *ptr=(unsigned char *)source;
long bytes=bits/8;
bits-=bytes*8;
if(b->endbit){
int i;
/* unaligned copy. Do it the hard way. */
for(i=0;i<bytes;i++)
w(b,(unsigned long)(ptr[i]),8);
}else{
/* aligned block copy */
if(b->endbyte+bytes+1>=b->storage){
void *ret;
if(!b->ptr)return;
b->storage=b->endbyte+bytes+BUFFER_INCREMENT;
ret=_ogg_realloc(b->buffer,b->storage);
if(!ret){
oggpack_writeclear(b);
return;
}
b->buffer=ret;
b->ptr=b->buffer+b->endbyte;
}
memmove(b->ptr,source,bytes);
b->ptr+=bytes;
b->endbyte+=bytes;
*b->ptr=0;
}
if(bits){
if(msb)
w(b,(unsigned long)(ptr[bytes]>>(8-bits)),bits);
else
w(b,(unsigned long)(ptr[bytes]),bits);
}
}
void oggpack_writecopy(oggpack_buffer *b,void *source,long bits){
oggpack_writecopy_helper(b,source,bits,oggpack_write,0);
}
void oggpackB_writecopy(oggpack_buffer *b,void *source,long bits){
oggpack_writecopy_helper(b,source,bits,oggpackB_write,1);
}
void oggpack_reset(oggpack_buffer *b){
if(!b->ptr)return;
b->ptr=b->buffer;
b->buffer[0]=0;
b->endbit=b->endbyte=0;
}
void oggpackB_reset(oggpack_buffer *b){
oggpack_reset(b);
}
void oggpack_writeclear(oggpack_buffer *b){
if(b->buffer)_ogg_free(b->buffer);
memset(b,0,sizeof(*b));
}
void oggpackB_writeclear(oggpack_buffer *b){
oggpack_writeclear(b);
}
void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes){
memset(b,0,sizeof(*b));
b->buffer=b->ptr=buf;
b->storage=bytes;
}
void oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,int bytes){
oggpack_readinit(b,buf,bytes);
}
/* Read in bits without advancing the bitptr; bits <= 32 */
long oggpack_look(oggpack_buffer *b,int bits){
unsigned long ret;
unsigned long m=mask[bits];
bits+=b->endbit;
if(b->endbyte+4>=b->storage){
/* not the main path */
if(b->endbyte*8+bits>b->storage*8)return(-1);
}
ret=b->ptr[0]>>b->endbit;
if(bits>8){
ret|=b->ptr[1]<<(8-b->endbit);
if(bits>16){
ret|=b->ptr[2]<<(16-b->endbit);
if(bits>24){
ret|=b->ptr[3]<<(24-b->endbit);
if(bits>32 && b->endbit)
ret|=b->ptr[4]<<(32-b->endbit);
}
}
}
return(m&ret);
}
/* Read in bits without advancing the bitptr; bits <= 32 */
long oggpackB_look(oggpack_buffer *b,int bits){
unsigned long ret;
int m=32-bits;
bits+=b->endbit;
if(b->endbyte+4>=b->storage){
/* not the main path */
if(b->endbyte*8+bits>b->storage*8)return(-1);
}
ret=b->ptr[0]<<(24+b->endbit);
if(bits>8){
ret|=b->ptr[1]<<(16+b->endbit);
if(bits>16){
ret|=b->ptr[2]<<(8+b->endbit);
if(bits>24){
ret|=b->ptr[3]<<(b->endbit);
if(bits>32 && b->endbit)
ret|=b->ptr[4]>>(8-b->endbit);
}
}
}
return ((ret&0xffffffff)>>(m>>1))>>((m+1)>>1);
}
long oggpack_look1(oggpack_buffer *b){
if(b->endbyte>=b->storage)return(-1);
return((b->ptr[0]>>b->endbit)&1);
}
long oggpackB_look1(oggpack_buffer *b){
if(b->endbyte>=b->storage)return(-1);
return((b->ptr[0]>>(7-b->endbit))&1);
}
void oggpack_adv(oggpack_buffer *b,int bits){
bits+=b->endbit;
b->ptr+=bits/8;
b->endbyte+=bits/8;
b->endbit=bits&7;
}
void oggpackB_adv(oggpack_buffer *b,int bits){
oggpack_adv(b,bits);
}
void oggpack_adv1(oggpack_buffer *b){
if(++(b->endbit)>7){
b->endbit=0;
b->ptr++;
b->endbyte++;
}
}
void oggpackB_adv1(oggpack_buffer *b){
oggpack_adv1(b);
}
/* bits <= 32 */
long oggpack_read(oggpack_buffer *b,int bits){
long ret;
unsigned long m=mask[bits];
bits+=b->endbit;
if(b->endbyte+4>=b->storage){
/* not the main path */
ret=-1L;
if(b->endbyte*8+bits>b->storage*8)goto overflow;
}
ret=b->ptr[0]>>b->endbit;
if(bits>8){
ret|=b->ptr[1]<<(8-b->endbit);
if(bits>16){
ret|=b->ptr[2]<<(16-b->endbit);
if(bits>24){
ret|=b->ptr[3]<<(24-b->endbit);
if(bits>32 && b->endbit){
ret|=b->ptr[4]<<(32-b->endbit);
}
}
}
}
ret&=m;
overflow:
b->ptr+=bits/8;
b->endbyte+=bits/8;
b->endbit=bits&7;
return(ret);
}
/* bits <= 32 */
long oggpackB_read(oggpack_buffer *b,int bits){
long ret;
long m=32-bits;
bits+=b->endbit;
if(b->endbyte+4>=b->storage){
/* not the main path */
ret=-1L;
if(b->endbyte*8+bits>b->storage*8)goto overflow;
/* special case to avoid reading b->ptr[0], which might be past the end of
the buffer; also skips some useless accounting */
else if(!bits)return(0L);
}
ret=b->ptr[0]<<(24+b->endbit);
if(bits>8){
ret|=b->ptr[1]<<(16+b->endbit);
if(bits>16){
ret|=b->ptr[2]<<(8+b->endbit);
if(bits>24){
ret|=b->ptr[3]<<(b->endbit);
if(bits>32 && b->endbit)
ret|=b->ptr[4]>>(8-b->endbit);
}
}
}
ret=((ret&0xffffffffUL)>>(m>>1))>>((m+1)>>1);
overflow:
b->ptr+=bits/8;
b->endbyte+=bits/8;
b->endbit=bits&7;
return(ret);
}
long oggpack_read1(oggpack_buffer *b){
long ret;
if(b->endbyte>=b->storage){
/* not the main path */
ret=-1L;
goto overflow;
}
ret=(b->ptr[0]>>b->endbit)&1;
overflow:
b->endbit++;
if(b->endbit>7){
b->endbit=0;
b->ptr++;
b->endbyte++;
}
return(ret);
}
long oggpackB_read1(oggpack_buffer *b){
long ret;
if(b->endbyte>=b->storage){
/* not the main path */
ret=-1L;
goto overflow;
}
ret=(b->ptr[0]>>(7-b->endbit))&1;
overflow:
b->endbit++;
if(b->endbit>7){
b->endbit=0;
b->ptr++;
b->endbyte++;
}
return(ret);
}
long oggpack_bytes(oggpack_buffer *b){
return(b->endbyte+(b->endbit+7)/8);
}
long oggpack_bits(oggpack_buffer *b){
return(b->endbyte*8+b->endbit);
}
long oggpackB_bytes(oggpack_buffer *b){
return oggpack_bytes(b);
}
long oggpackB_bits(oggpack_buffer *b){
return oggpack_bits(b);
}
unsigned char *oggpack_get_buffer(oggpack_buffer *b){
return(b->buffer);
}
unsigned char *oggpackB_get_buffer(oggpack_buffer *b){
return oggpack_get_buffer(b);
}
/* Self test of the bitwise routines; everything else is based on
them, so they damned well better be solid. */
#ifdef _V_SELFTEST
#include <stdio.h>
static int ilog(unsigned int v){
int ret=0;
while(v){
ret++;
v>>=1;
}
return(ret);
}
oggpack_buffer o;
oggpack_buffer r;
void report(char *in){
fprintf(stderr,"%s",in);
exit(1);
}
void cliptest(unsigned long *b,int vals,int bits,int *comp,int compsize){
long bytes,i;
unsigned char *buffer;
oggpack_reset(&o);
for(i=0;i<vals;i++)
oggpack_write(&o,b[i],bits?bits:ilog(b[i]));
buffer=oggpack_get_buffer(&o);
bytes=oggpack_bytes(&o);
if(bytes!=compsize)report("wrong number of bytes!\n");
for(i=0;i<bytes;i++)if(buffer[i]!=comp[i]){
for(i=0;i<bytes;i++)fprintf(stderr,"%x %x\n",(int)buffer[i],(int)comp[i]);
report("wrote incorrect value!\n");
}
oggpack_readinit(&r,buffer,bytes);
for(i=0;i<vals;i++){
int tbit=bits?bits:ilog(b[i]);
if(oggpack_look(&r,tbit)==-1)
report("out of data!\n");
if(oggpack_look(&r,tbit)!=(b[i]&mask[tbit]))
report("looked at incorrect value!\n");
if(tbit==1)
if(oggpack_look1(&r)!=(b[i]&mask[tbit]))
report("looked at single bit incorrect value!\n");
if(tbit==1){
if(oggpack_read1(&r)!=(b[i]&mask[tbit]))
report("read incorrect single bit value!\n");
}else{
if(oggpack_read(&r,tbit)!=(b[i]&mask[tbit]))
report("read incorrect value!\n");
}
}
if(oggpack_bytes(&r)!=bytes)report("leftover bytes after read!\n");
}
void cliptestB(unsigned long *b,int vals,int bits,int *comp,int compsize){
long bytes,i;
unsigned char *buffer;
oggpackB_reset(&o);
for(i=0;i<vals;i++)
oggpackB_write(&o,b[i],bits?bits:ilog(b[i]));
buffer=oggpackB_get_buffer(&o);
bytes=oggpackB_bytes(&o);
if(bytes!=compsize)report("wrong number of bytes!\n");
for(i=0;i<bytes;i++)if(buffer[i]!=comp[i]){
for(i=0;i<bytes;i++)fprintf(stderr,"%x %x\n",(int)buffer[i],(int)comp[i]);
report("wrote incorrect value!\n");
}
oggpackB_readinit(&r,buffer,bytes);
for(i=0;i<vals;i++){
int tbit=bits?bits:ilog(b[i]);
if(oggpackB_look(&r,tbit)==-1)
report("out of data!\n");
if(oggpackB_look(&r,tbit)!=(b[i]&mask[tbit]))
report("looked at incorrect value!\n");
if(tbit==1)
if(oggpackB_look1(&r)!=(b[i]&mask[tbit]))
report("looked at single bit incorrect value!\n");
if(tbit==1){
if(oggpackB_read1(&r)!=(b[i]&mask[tbit]))
report("read incorrect single bit value!\n");
}else{
if(oggpackB_read(&r,tbit)!=(b[i]&mask[tbit]))
report("read incorrect value!\n");
}
}
if(oggpackB_bytes(&r)!=bytes)report("leftover bytes after read!\n");
}
int main(void){
unsigned char *buffer;
long bytes,i;
static unsigned long testbuffer1[]=
{18,12,103948,4325,543,76,432,52,3,65,4,56,32,42,34,21,1,23,32,546,456,7,
567,56,8,8,55,3,52,342,341,4,265,7,67,86,2199,21,7,1,5,1,4};
int test1size=43;
static unsigned long testbuffer2[]=
{216531625L,1237861823,56732452,131,3212421,12325343,34547562,12313212,
1233432,534,5,346435231,14436467,7869299,76326614,167548585,
85525151,0,12321,1,349528352};
int test2size=21;
static unsigned long testbuffer3[]=
{1,0,14,0,1,0,12,0,1,0,0,0,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,1,1,1,1,1,0,0,1,
0,1,30,1,1,1,0,0,1,0,0,0,12,0,11,0,1,0,0,1};
int test3size=56;
static unsigned long large[]=
{2136531625L,2137861823,56732452,131,3212421,12325343,34547562,12313212,
1233432,534,5,2146435231,14436467,7869299,76326614,167548585,
85525151,0,12321,1,2146528352};
int onesize=33;
static int one[33]={146,25,44,151,195,15,153,176,233,131,196,65,85,172,47,40,
34,242,223,136,35,222,211,86,171,50,225,135,214,75,172,
223,4};
static int oneB[33]={150,101,131,33,203,15,204,216,105,193,156,65,84,85,222,
8,139,145,227,126,34,55,244,171,85,100,39,195,173,18,
245,251,128};
int twosize=6;
static int two[6]={61,255,255,251,231,29};
static int twoB[6]={247,63,255,253,249,120};
int threesize=54;
static int three[54]={169,2,232,252,91,132,156,36,89,13,123,176,144,32,254,
142,224,85,59,121,144,79,124,23,67,90,90,216,79,23,83,
58,135,196,61,55,129,183,54,101,100,170,37,127,126,10,
100,52,4,14,18,86,77,1};
static int threeB[54]={206,128,42,153,57,8,183,251,13,89,36,30,32,144,183,
130,59,240,121,59,85,223,19,228,180,134,33,107,74,98,
233,253,196,135,63,2,110,114,50,155,90,127,37,170,104,
200,20,254,4,58,106,176,144,0};
int foursize=38;
static int four[38]={18,6,163,252,97,194,104,131,32,1,7,82,137,42,129,11,72,
132,60,220,112,8,196,109,64,179,86,9,137,195,208,122,169,
28,2,133,0,1};
static int fourB[38]={36,48,102,83,243,24,52,7,4,35,132,10,145,21,2,93,2,41,
1,219,184,16,33,184,54,149,170,132,18,30,29,98,229,67,
129,10,4,32};
int fivesize=45;
static int five[45]={169,2,126,139,144,172,30,4,80,72,240,59,130,218,73,62,
241,24,210,44,4,20,0,248,116,49,135,100,110,130,181,169,
84,75,159,2,1,0,132,192,8,0,0,18,22};
static int fiveB[45]={1,84,145,111,245,100,128,8,56,36,40,71,126,78,213,226,
124,105,12,0,133,128,0,162,233,242,67,152,77,205,77,
172,150,169,129,79,128,0,6,4,32,0,27,9,0};
int sixsize=7;
static int six[7]={17,177,170,242,169,19,148};
static int sixB[7]={136,141,85,79,149,200,41};
/* Test read/write together */
/* Later we test against pregenerated bitstreams */
oggpack_writeinit(&o);
fprintf(stderr,"\nSmall preclipped packing (LSb): ");
cliptest(testbuffer1,test1size,0,one,onesize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nNull bit call (LSb): ");
cliptest(testbuffer3,test3size,0,two,twosize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nLarge preclipped packing (LSb): ");
cliptest(testbuffer2,test2size,0,three,threesize);
fprintf(stderr,"ok.");
fprintf(stderr,"\n32 bit preclipped packing (LSb): ");
oggpack_reset(&o);
for(i=0;i<test2size;i++)
oggpack_write(&o,large[i],32);
buffer=oggpack_get_buffer(&o);
bytes=oggpack_bytes(&o);
oggpack_readinit(&r,buffer,bytes);
for(i=0;i<test2size;i++){
if(oggpack_look(&r,32)==-1)report("out of data. failed!");
if(oggpack_look(&r,32)!=large[i]){
fprintf(stderr,"%ld != %ld (%lx!=%lx):",oggpack_look(&r,32),large[i],
oggpack_look(&r,32),large[i]);
report("read incorrect value!\n");
}
oggpack_adv(&r,32);
}
if(oggpack_bytes(&r)!=bytes)report("leftover bytes after read!\n");
fprintf(stderr,"ok.");
fprintf(stderr,"\nSmall unclipped packing (LSb): ");
cliptest(testbuffer1,test1size,7,four,foursize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nLarge unclipped packing (LSb): ");
cliptest(testbuffer2,test2size,17,five,fivesize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nSingle bit unclipped packing (LSb): ");
cliptest(testbuffer3,test3size,1,six,sixsize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nTesting read past end (LSb): ");
oggpack_readinit(&r,"\0\0\0\0\0\0\0\0",8);
for(i=0;i<64;i++){
if(oggpack_read(&r,1)!=0){
fprintf(stderr,"failed; got -1 prematurely.\n");
exit(1);
}
}
if(oggpack_look(&r,1)!=-1 ||
oggpack_read(&r,1)!=-1){
fprintf(stderr,"failed; read past end without -1.\n");
exit(1);
}
oggpack_readinit(&r,"\0\0\0\0\0\0\0\0",8);
if(oggpack_read(&r,30)!=0 || oggpack_read(&r,16)!=0){
fprintf(stderr,"failed 2; got -1 prematurely.\n");
exit(1);
}
if(oggpack_look(&r,18)!=0 ||
oggpack_look(&r,18)!=0){
fprintf(stderr,"failed 3; got -1 prematurely.\n");
exit(1);
}
if(oggpack_look(&r,19)!=-1 ||
oggpack_look(&r,19)!=-1){
fprintf(stderr,"failed; read past end without -1.\n");
exit(1);
}
if(oggpack_look(&r,32)!=-1 ||
oggpack_look(&r,32)!=-1){
fprintf(stderr,"failed; read past end without -1.\n");
exit(1);
}
oggpack_writeclear(&o);
fprintf(stderr,"ok.\n");
/********** lazy, cut-n-paste retest with MSb packing ***********/
/* Test read/write together */
/* Later we test against pregenerated bitstreams */
oggpackB_writeinit(&o);
fprintf(stderr,"\nSmall preclipped packing (MSb): ");
cliptestB(testbuffer1,test1size,0,oneB,onesize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nNull bit call (MSb): ");
cliptestB(testbuffer3,test3size,0,twoB,twosize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nLarge preclipped packing (MSb): ");
cliptestB(testbuffer2,test2size,0,threeB,threesize);
fprintf(stderr,"ok.");
fprintf(stderr,"\n32 bit preclipped packing (MSb): ");
oggpackB_reset(&o);
for(i=0;i<test2size;i++)
oggpackB_write(&o,large[i],32);
buffer=oggpackB_get_buffer(&o);
bytes=oggpackB_bytes(&o);
oggpackB_readinit(&r,buffer,bytes);
for(i=0;i<test2size;i++){
if(oggpackB_look(&r,32)==-1)report("out of data. failed!");
if(oggpackB_look(&r,32)!=large[i]){
fprintf(stderr,"%ld != %ld (%lx!=%lx):",oggpackB_look(&r,32),large[i],
oggpackB_look(&r,32),large[i]);
report("read incorrect value!\n");
}
oggpackB_adv(&r,32);
}
if(oggpackB_bytes(&r)!=bytes)report("leftover bytes after read!\n");
fprintf(stderr,"ok.");
fprintf(stderr,"\nSmall unclipped packing (MSb): ");
cliptestB(testbuffer1,test1size,7,fourB,foursize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nLarge unclipped packing (MSb): ");
cliptestB(testbuffer2,test2size,17,fiveB,fivesize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nSingle bit unclipped packing (MSb): ");
cliptestB(testbuffer3,test3size,1,sixB,sixsize);
fprintf(stderr,"ok.");
fprintf(stderr,"\nTesting read past end (MSb): ");
oggpackB_readinit(&r,"\0\0\0\0\0\0\0\0",8);
for(i=0;i<64;i++){
if(oggpackB_read(&r,1)!=0){
fprintf(stderr,"failed; got -1 prematurely.\n");
exit(1);
}
}
if(oggpackB_look(&r,1)!=-1 ||
oggpackB_read(&r,1)!=-1){
fprintf(stderr,"failed; read past end without -1.\n");
exit(1);
}
oggpackB_readinit(&r,"\0\0\0\0\0\0\0\0",8);
if(oggpackB_read(&r,30)!=0 || oggpackB_read(&r,16)!=0){
fprintf(stderr,"failed 2; got -1 prematurely.\n");
exit(1);
}
if(oggpackB_look(&r,18)!=0 ||
oggpackB_look(&r,18)!=0){
fprintf(stderr,"failed 3; got -1 prematurely.\n");
exit(1);
}
if(oggpackB_look(&r,19)!=-1 ||
oggpackB_look(&r,19)!=-1){
fprintf(stderr,"failed; read past end without -1.\n");
exit(1);
}
if(oggpackB_look(&r,32)!=-1 ||
oggpackB_look(&r,32)!=-1){
fprintf(stderr,"failed; read past end without -1.\n");
exit(1);
}
oggpackB_writeclear(&o);
fprintf(stderr,"ok.\n\n");
return(0);
}
#endif /* _V_SELFTEST */
#undef BUFFER_INCREMENT

2074
jni/ogg/src/framing.c
View File

File diff suppressed because it is too large Load Diff

8
jni/sdl-1.2/Android.mk
View File

@@ -2,12 +2,16 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := $(lastword $(subst /, ,$(LOCAL_PATH)))
LOCAL_MODULE := libsdl-1.2
ifndef SDL_JAVA_PACKAGE_PATH
$(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
endif
SDL_TRACKBALL_KEYUP_DELAY := 1
SDL_VIDEO_RENDER_RESIZE := 1
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -O3 \
-DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) \
@@ -55,7 +59,7 @@ LOCAL_CPP_EXTENSION := .cpp
# Note this "simple" makefile var substitution, you can find even more complex examples in different Android projects
LOCAL_SRC_FILES := $(foreach F, $(SDL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
LOCAL_SHARED_LIBRARIES := sdl_native_helpers # Not really a dependency, needed for CustomBuildScript
LOCAL_SHARED_LIBRARIES := libsdl_native_helpers # Not really a dependency, needed for CustomBuildScript
LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog

1
jni/sdl-1.2/src/audio/android/SDL_androidaudio.c
View File

@@ -405,6 +405,7 @@ JNIEXPORT jint JNICALL JAVA_EXPORT_NAME(AudioThread_nativeAudioInitJavaCallbacks
JavaDeinitAudio = (*jniEnv)->GetMethodID(jniEnv, JavaAudioThreadClass, "deinitAudio", "()I");
JavaPauseAudioPlayback = (*jniEnv)->GetMethodID(jniEnv, JavaAudioThreadClass, "pauseAudioPlayback", "()I");
JavaResumeAudioPlayback = (*jniEnv)->GetMethodID(jniEnv, JavaAudioThreadClass, "resumeAudioPlayback", "()I");
return 0;
}
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)

4
jni/sdl-1.2/src/video/android/SDL_androidvideo.c
View File

@@ -367,6 +367,7 @@ int SDL_ANDROID_SetApplicationPutToBackgroundCallback(
if( appRestoredCallback )
appRestoredCallback = appRestored;
return 0;
}
extern int SDL_ANDROID_SetOpenALPutToBackgroundCallback(
@@ -379,6 +380,7 @@ int SDL_ANDROID_SetOpenALPutToBackgroundCallback(
{
openALPutToBackgroundCallback = PutToBackground;
openALRestoredCallback = Restored;
return 0;
}
JNIEXPORT void JNICALL
@@ -429,6 +431,7 @@ int SDLCALL SDL_SetClipboardText(const char *text)
if( s )
(*JavaEnv)->DeleteLocalRef( JavaEnv, s );
(*JavaEnv)->PopLocalFrame(JavaEnv, NULL);
return 0;
}
char * SDLCALL SDL_GetClipboardText(void)
@@ -465,6 +468,7 @@ int SDLCALL SDL_HasClipboardText(void)
return ret;
}
JNIEXPORT void JNICALL
JAVA_EXPORT_NAME(DemoRenderer_nativeClipboardChanged) ( JNIEnv* env, jobject thiz )
{
if ( SDL_ProcessEvents[SDL_SYSWMEVENT] == SDL_ENABLE )

3
jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
View File

@@ -1165,6 +1165,7 @@ SDLKey SDL_ANDROID_GetScreenKeyboardButtonKey(int buttonId)
int SDL_ANDROID_SetScreenKeyboardShown(int shown)
{
touchscreenKeyboardShown = shown;
return 0;
};
int SDL_ANDROID_GetScreenKeyboardShown(void)
@@ -1268,6 +1269,7 @@ int SDLCALL SDL_ANDROID_SetScreenKeyboardButtonStayPressedAfterTouch(int buttonI
int SDLCALL SDL_ANDROID_SetScreenKeyboardTransparency(int alpha)
{
transparency = (float)alpha / 255.0f;
return 0;
}
static int ScreenKbRedefinedByUser = 0;
@@ -1327,6 +1329,7 @@ extern DECLSPEC int SDL_ANDROID_ScreenKeyboardUpdateToNewVideoMode(int oldx, int
pos2.h = (pos.y + pos.h) * newy / oldy - pos2.y;
SDL_ANDROID_SetScreenKeyboardButtonPos(i, &pos2);
}
return 0;
}
/**

4
jni/sdl_main/Android.mk
View File

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := sdl_main
LOCAL_MODULE := libsdl_main
ifndef SDL_JAVA_PACKAGE_PATH
$(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
@@ -15,7 +15,7 @@ LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := sdl_main.c SDL_android_main.cpp
LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) application
LOCAL_SHARED_LIBRARIES := libsdl-$(SDL_VERSION) libapplication
LOCAL_LDLIBS := -llog
include $(BUILD_SHARED_LIBRARY)

2
jni/sdl_native_helpers/Android.mk
View File

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := sdl_native_helpers
LOCAL_MODULE := libsdl_native_helpers
ifndef SDL_JAVA_PACKAGE_PATH
$(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")

6
jni/sdl_ttf/Android.mk
View File

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := sdl_ttf
LOCAL_MODULE := libsdl_ttf
LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/../freetype/include $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Os
@@ -11,8 +11,8 @@ LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := SDL_ttf.c
LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
LOCAL_STATIC_LIBRARIES := freetype
LOCAL_SHARED_LIBRARIES := libsdl-$(SDL_VERSION)
LOCAL_STATIC_LIBRARIES := libfreetype
LOCAL_LDLIBS := -lz
include $(BUILD_SHARED_LIBRARY)

20
proguard-project.txt
View File

@@ -1,20 +0,0 @@
# To enable ProGuard in your project, edit project.properties
# to define the proguard.config property as described in that file.
#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in ${sdk.dir}/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the ProGuard
# include property in project.properties.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

14
project.properties
View File

@@ -1,14 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-21