Skip to content

Commit

Permalink
continued work on pandora port - mainly changes to get unity player w…
Browse files Browse the repository at this point in the history 
…orking (somewhen)
  • Loading branch information
crowriot committed Jan 13, 2013
1 parent 2c57de6 commit c134ddc
Show file tree
Hide file tree
Showing 15 changed files with 178 additions and 319 deletions.
35 changes: 27 additions & 8 deletions apkenv.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@
<Compiler>
<Add option="-g" />
<Add option="-DDEBUG=1" />
<Add option="-DLINKER_DEBUG=0" />
<Add option="-DAPKENV_DEBUG" />
<Add option="-DAPKENV_GLES" />
</Compiler>
<Linker>
<Add library="GLES_CM" />
</Linker>
</Target>
<Target title="Release">
<Option output="bin/Release/apkenv" prefix_auto="1" extension_auto="1" />
Expand All @@ -23,18 +29,34 @@
<Option compiler="pandora_compiler" />
<Compiler>
<Add option="-O2" />
<Add option="-DLINKER_DEBUG=0" />
<Add option="-DAPKENV_GLES" />
</Compiler>
<Linker>
<Add option="-s" />
<Add library="GLES_CM" />
</Linker>
</Target>
<Target title="Debug GLES2">
<Option output="bin/Debug/apkenv" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug/" />
<Option type="1" />
<Option compiler="pandora_compiler" />
<Compiler>
<Add option="-g" />
<Add option="-DDEBUG=1" />
<Add option="-DLINKER_DEBUG=0" />
<Add option="-DAPKENV_DEBUG" />
<Add option="-DAPKENV_GLES2" />
</Compiler>
<Linker>
<Add library="GLESv2" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="-DPANDORA" />
<Add option="-DLINKER_DEBUG=1" />
<Add option="-DAPKENV_GLES" />
<Add option="-DAPKENV_DEBUGx" />
</Compiler>
<Linker>
<Add library="SDL" />
Expand All @@ -43,7 +65,7 @@
<Add library="dl" />
<Add library="EGL" />
<Add library="X11" />
<Add library="GLES_CM" />
<Add library="SDL_mixer" />
</Linker>
<Unit filename="apkenv.c">
<Option compilerVar="CC" />
Expand Down Expand Up @@ -136,10 +158,7 @@
<code_completion />
<debugger>
<remote_debugging>
<options conn_type="0" serial_baud="115200" ip_address="pandora" ip_port="2345" />
</remote_debugging>
<remote_debugging target="Debug">
<options conn_type="0" serial_baud="115200" ip_address="pandora" ip_port="2345" />
<options conn_type="0" serial_baud="115200" ip_address="pandora" ip_port="2222" />
</remote_debugging>
</debugger>
</Extensions>
Expand Down
298 changes: 0 additions & 298 deletions apkenv.depend
View file
Original file line number Diff line number Diff line change
@@ -1,299 +1 @@
# depslib dependency file v1.0
1357595349 source:/home/xubuntu/Pandora/apkenv/apkenv.c
<dlfcn.h>
<assert.h>
<stdio.h>
<sys/stat.h>
<dirent.h>
<SDL/SDL.h>
<SDL/SDL_gles.h>
"pandora/glesinit.h"
<SDL/SDL_syswm.h>
<X11/Xlib.h>
<X11/Xatom.h>
"jni/jnienv.h"
"jni/shlib.h"
"apklib/apklib.h"
"apkenv.h"

1357338917 /home/xubuntu/Pandora/apkenv/pandora/eglport.h
<stdio.h>
<math.h>
<GLES/gl.h>
<EGL/egl.h>
<SDL/SDL_syswm.h>
<X11/Xlib.h>

1357669944 /home/xubuntu/Pandora/apkenv/jni/jnienv.h
"../apkenv.h"
"jni.h"

1357669462 /home/xubuntu/Pandora/apkenv/apkenv.h
"apklib/apklib.h"
"jni/jni.h"

1357669944 /home/xubuntu/Pandora/apkenv/apklib/apklib.h
"unzip.h"

1357669944 /home/xubuntu/Pandora/apkenv/apklib/unzip.h
"zlib.h"
"ioapi.h"
"bzlib.h"

1357669944 /home/xubuntu/Pandora/apkenv/apklib/ioapi.h
<stdio.h>
<stdlib.h>
"zlib.h"
<stdint.h>
"mz64conf.h"
"stdint.h"

1357669944 /home/xubuntu/Pandora/apkenv/jni/jni.h
<stdarg.h>
<inttypes.h>

1357304111 /home/xubuntu/Pandora/apkenv/jni/shlib.h
"../apkenv.h"

1357669462 source:/home/xubuntu/Pandora/apkenv/apklib/apklib.c
<zlib.h>
<limits.h>
<assert.h>
<string.h>
"unzip.h"
"ioapi_mem.h"
"apklib.h"

1357669944 /home/xubuntu/Pandora/apkenv/apklib/ioapi_mem.h

1357669944 source:/home/xubuntu/Pandora/apkenv/apklib/ioapi.c
"ioapi.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/apklib/ioapi_mem.c
<stdio.h>
<stdlib.h>
<string.h>
"zlib.h"
"ioapi.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/apklib/unzip.c
<stdio.h>
<stdlib.h>
<string.h>
"zlib.h"
"unzip.h"
<stddef.h>
<string.h>
<stdlib.h>
<errno.h>
"crypt.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/compat/gles2_wrappers.c
"gles2_wrappers.h"
<assert.h>

1357669944 /home/xubuntu/Pandora/apkenv/compat/gles2_wrappers.h
<GLES2/gl2.h>
<GLES2/gl2ext.h>
"../apkenv.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/compat/gles_wrappers.c
"gles_wrappers.h"
<assert.h>

1357669944 /home/xubuntu/Pandora/apkenv/compat/gles_wrappers.h
<GLES/gl.h>
<GLES/glext.h>
"../apkenv.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/compat/hooks.c
<stdio.h>
<stdlib.h>
<string.h>
"hooks.h"
"libc_wrappers.h"
"liblog_wrappers.h"
"gles_wrappers.h"
"gles2_wrappers.h"
"pthread_wrappers.h"
"libc_mapping.h"
"liblog_mapping.h"
"gles_mapping.h"
"gles2_mapping.h"
"pthread_mapping.h"

1357669944 /home/xubuntu/Pandora/apkenv/compat/hooks.h

1357669944 /home/xubuntu/Pandora/apkenv/compat/libc_wrappers.h
<ctype.h>
<errno.h>
<fcntl.h>
<float.h>
<limits.h>
<locale.h>
<math.h>
<netdb.h>
<sched.h>
<setjmp.h>
<signal.h>
<stdarg.h>
<stdio.h>
<stdlib.h>
<string.h>
<strings.h>
<sys/mman.h>
<sys/select.h>
<sys/socket.h>
<sys/stat.h>
<sys/time.h>
<sys/ioctl.h>
<sys/types.h>
<time.h>
<unistd.h>
<poll.h>
<pwd.h>
<arpa/inet.h>
<setjmp.h>
<wctype.h>
<wchar.h>
<zlib.h>
"../apkenv.h"

1357669944 /home/xubuntu/Pandora/apkenv/compat/liblog_wrappers.h
<stdio.h>
<stdarg.h>
"../apkenv.h"

1357669944 /home/xubuntu/Pandora/apkenv/compat/pthread_wrappers.h
<stdio.h>
<stdlib.h>
<string.h>
<pthread.h>
<assert.h>

1357669944 /home/xubuntu/Pandora/apkenv/compat/libc_mapping.h

1357669944 /home/xubuntu/Pandora/apkenv/compat/liblog_mapping.h

1357669944 /home/xubuntu/Pandora/apkenv/compat/gles_mapping.h

1357669944 /home/xubuntu/Pandora/apkenv/compat/gles2_mapping.h

1357669944 /home/xubuntu/Pandora/apkenv/compat/pthread_mapping.h

1357669944 source:/home/xubuntu/Pandora/apkenv/compat/libc_wrappers.c
"libc_wrappers.h"
<assert.h>

1357669944 source:/home/xubuntu/Pandora/apkenv/compat/liblog_wrappers.c
"liblog_wrappers.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/compat/pthread_wrappers.c
"pthread_wrappers.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/jni/jnienv.c
<stdio.h>
<string.h>
<stdlib.h>
"jnienv.h"
"../apkenv.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/jni/shlib.c
<stdio.h>
<assert.h>
<elf.h>
<stdlib.h>
<string.h>
"../apkenv.h"

1357669944 source:/home/xubuntu/Pandora/apkenv/linker/dlfcn.c
<dlfcn.h>
<pthread.h>
<time.h>
<stdio.h>
<string.h>
"linker.h"
"linker_format.h"

1357669944 /home/xubuntu/Pandora/apkenv/linker/linker.h
<unistd.h>
<sys/types.h>
<elf.h>

1357669944 /home/xubuntu/Pandora/apkenv/linker/linker_format.h
<stdarg.h>
<stddef.h>

1357669944 source:/home/xubuntu/Pandora/apkenv/linker/linker.c
<linux/auxvec.h>
<stdio.h>
<stdlib.h>
<string.h>
<unistd.h>
<fcntl.h>
<errno.h>
<dlfcn.h>
<sys/stat.h>
<pthread.h>
<sys/mman.h>
"bionic_tls.h"
"strlcpy.h"
"../compat/hooks.h"
"linker.h"
"linker_debug.h"
"linker_environ.h"
"linker_format.h"

1357669944 /home/xubuntu/Pandora/apkenv/linker/bionic_tls.h
<sys/cdefs.h>

1357669944 /home/xubuntu/Pandora/apkenv/linker/strlcpy.h
<sys/types.h>
<string.h>

1357669944 /home/xubuntu/Pandora/apkenv/linker/linker_debug.h
<stdio.h>
"linker_format.h"

1357669944 /home/xubuntu/Pandora/apkenv/linker/linker_environ.h

1357669944 source:/home/xubuntu/Pandora/apkenv/linker/linker_environ.c
"linker_environ.h"
<stddef.h>

1357669944 source:/home/xubuntu/Pandora/apkenv/linker/linker_format.c
<stdarg.h>
<string.h>
<errno.h>
<unistd.h>
<stdint.h>
<stddef.h>
"linker_format.h"
"linker_debug.h"
<unistd.h>
<fcntl.h>
<sys/uio.h>
<stdio.h>

1357669944 source:/home/xubuntu/Pandora/apkenv/linker/rt.c

1357669944 source:/home/xubuntu/Pandora/apkenv/linker/strlcpy.c
"strlcpy.h"

1357342411 source:/home/xubuntu/Pandora/apkenv/pandora/eglport.c
"eglport.h"
<fcntl.h>
<sys/ioctl.h>
<linux/fb.h>

1357669461 /home/xubuntu/Pandora/apkenv/pandora/glesinit.h

1357669461 source:/home/xubuntu/Pandora/apkenv/pandora/glesinit.c
"glesinit.h"
<GLES/gl.h>
<GLES/egl.h>
<SDL/SDL_syswm.h>
<fcntl.h>
<sys/ioctl.h>
<linux/fb.h>

5 changes: 4 additions & 1 deletion compat/gles2_wrappers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
#include "gles2_wrappers.h"
#include <assert.h>
#ifdef APKENV_DEBUG
# define WRAPPERS_DEBUG_PRINTF(...) printf(__VA_ARGS__)
# define WRAPPERS_DEBUG_PRINTF(...) printf("%d %s", pthread_self(), __VA_ARGS__)
#else
# define WRAPPERS_DEBUG_PRINTF(...)
#endif

#include <pthread.h>

void
my_glActiveTexture(GLenum texture)
{
Expand Down
2 changes: 1 addition & 1 deletion compat/libc_mapping.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

{"ioctl", ioctl},
{"mmap", mmap},
{"munmap", munmap},
{"munmap", my_munmap},
{"poll", poll},

{"mkdir", mkdir},
Expand Down
Loading

0 comments on commit c134ddc

Please sign in to comment.