sdl/Makefile.flash sdl/include/SDL_config_flash.h sdl/src/video/flash/SDL_flashevents.c sdl/src/video/flash/SDL_flashevents_c.h sdl/src/video/flash/SDL_flashmouse.c sdl/src/video/flash/SDL_flashmouse_c.h sdl/src/video/flash/SDL_flashvideo.c sdl/src/video/flash/SDL_flashvideo.h @@ -5,6 +5,7 @@ package { public class FlashDisplay extends Sprite { public function FlashDisplay() { var loader:CLibInit = new CLibInit; + // loader.putEnv("SDL_VIDEODRIVER", "flash"); var lib:Object = loader.init(); lib.run(this); } FlashDisplay.as @@ -3,13 +3,13 @@ FlashDisplay.swf: libSDL.swc mxmlc -library-path+=libSDL.swc --target-player=10.0.0 FlashDisplay.as libSDL.swc: libSDL.a - gcc flashSDL.c -DFLASHVM -Isdl/include -Lsdl -lSDL -swc -O3 -o libSDL.swc + gcc flashSDL.c -DFLASH -Isdl/include -Lsdl -lSDL -swc -O3 -o libSDL.swc libSDL.a: - cd sdl; make -f Makefile.flashvm clean all; cd .. + cd sdl; make -f Makefile.flash clean all; cd .. clean: - cd sdl; make -f Makefile.flashvm clean; cd .. + cd sdl; make -f Makefile.flash clean; cd .. rm FlashDisplay.swf rm libSDL.swc rm sdl/SDL.l.bc Makefile @@ -55,7 +55,8 @@ AS3_Val run(void *data, AS3_Val args) bitmapData = initDisplay(parent, 320, 240); - SDL_Init(SDL_INIT_VIDEO); + if(SDL_Init(SDL_INIT_VIDEO) > 0) sztrace("sdl init successful"); + else sztrace("sdl init unsuccessful"); _fillRect(bitmapData, 50, 50, 50, 50, 0xFF00FF); flashSDL.c @@ -38,8 +38,8 @@ #include "SDL_config_win32.h" #elif defined(__OS2__) #include "SDL_config_os2.h" -#elif defined(__FLASHVM__) -#include "SDL_config_flashvm.h" +#elif defined(__FLASH__) +#include "SDL_config_flash.h" #else #include "SDL_config_minimal.h" #endif /* platform config */ sdl/include/SDL_config.h @@ -38,7 +38,7 @@ #include "SDL_config_win32.h" #elif defined(__OS2__) #include "SDL_config_os2.h" -#elif defined(__FLASHVM__) +#elif defined(__FLASH__) #include "SDL_config_flashvm.h" #else #include "SDL_config_minimal.h" sdl/include/SDL_config.h.default @@ -96,9 +96,9 @@ #undef __WIN32__ #define __WIN32__ 1 #endif -#if defined(FLASHVM) -#undef __FLASHVM__ -#define __FLASHVM__ 1 +#if defined(FLASH) +#undef __FLASH__ +#define __FLASH__ 1 #endif #endif /* _SDL_platform_h */ sdl/include/SDL_platform.h @@ -67,7 +67,7 @@ int surfaces_allocated = 0; int SDL_InitSubSystem(Uint32 flags) { - printf("in SDL_InitSubSystem()\n"); + sztrace("SDL_InitSubSystem()"); #if !SDL_VIDEO_DISABLED /* Initialize the video/event subsystem */ if ( (flags & SDL_INIT_VIDEO) && !(SDL_initialized & SDL_INIT_VIDEO) ) { @@ -76,6 +76,7 @@ int SDL_InitSubSystem(Uint32 flags) return(-1); } SDL_initialized |= SDL_INIT_VIDEO; + sztrace("video init!!"); } #else if ( flags & SDL_INIT_VIDEO ) { sdl/src/SDL.c @@ -404,12 +404,12 @@ extern VideoBootStrap OS2FSLib_bootstrap; #if SDL_VIDEO_DRIVER_AALIB extern VideoBootStrap AALIB_bootstrap; #endif -#if SDL_VIDEO_DRIVER_DUMMY -extern VideoBootStrap DUMMY_bootstrap; -#endif #if SDL_VIDEO_DRIVER_FLASH extern VideoBootStrap FLASH_bootstrap; #endif +#if SDL_VIDEO_DRIVER_DUMMY +extern VideoBootStrap DUMMY_bootstrap; +#endif /* This is the current video device */ extern SDL_VideoDevice *current_video; sdl/src/video/SDL_sysvideo.h @@ -120,12 +120,12 @@ static VideoBootStrap *bootstrap[] = { #if SDL_VIDEO_DRIVER_AALIB &AALIB_bootstrap, #endif +#if SDL_VIDEO_DRIVER_FLASH + &FLASH_bootstrap, +#endif #if SDL_VIDEO_DRIVER_DUMMY &DUMMY_bootstrap, #endif -#if SDL_VIDEO_DRIVER_FLASHVM - &FLASH_bootstrap, -#endif NULL }; @@ -153,6 +153,9 @@ int SDL_VideoInit (const char *driver_name, Uint32 flags) SDL_PixelFormat vformat; Uint32 video_flags; + sztrace("SDL_VideoInit (const char *driver_name, Uint32 flags)"); + sztrace(driver_name); + /* Toggle the event thread flags, based on OS requirements */ #if defined(MUST_THREAD_EVENTS) flags |= SDL_INIT_EVENTTHREAD; @@ -196,6 +199,7 @@ int SDL_VideoInit (const char *driver_name, Uint32 flags) } } if ( video == NULL ) { + sztrace("No available video device"); SDL_SetError("No available video device"); return(-1); } sdl/src/video/SDL_video.c sdl/Makefile.flashvm sdl/include/SDL_config_flashvm.h sdl/src/video/flashvm/SDL_flashevents.c sdl/src/video/flashvm/SDL_flashevents_c.h sdl/src/video/flashvm/SDL_flashmouse.c sdl/src/video/flashvm/SDL_flashmouse_c.h sdl/src/video/flashvm/SDL_flashvideo.c sdl/src/video/flashvm/SDL_flashvideo.h d329d660b1f3f7791a4bb93b9aeaf5118f604057 William Beene bwr@mirror.(none) http://github.com/bwr/flashsdl/commit/f96a70ffe766cc70edd55842abbfb460492298e9 f96a70ffe766cc70edd55842abbfb460492298e9 2008-11-23T15:28:21-08:00 2008-11-23T15:28:21-08:00 more nonsense c250e6d0fa7ba7b79e0a89c5c4f76e9d6ec48c0a William Beene bwr@mirror.(none)