# HG changeset patch # User Sam Lantinga # Date 1138784472 0 # Node ID 6c7b692182760b3bc7876063ac592ae57345845a # Parent 0781906086fa14ddfc20bcac099794bfcbc7b54f Updated exports diff -r 0781906086fa -r 6c7b69218276 src/main/beos/exports/Makefile --- a/src/main/beos/exports/Makefile Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/beos/exports/Makefile Wed Feb 01 09:01:12 2006 +0000 @@ -11,11 +11,11 @@ ../../../../include/SDL_endian.h \ ../../../../include/SDL_error.h \ ../../../../include/SDL_events.h \ + ../../../../include/SDL_getenv.h \ ../../../../include/SDL_joystick.h \ ../../../../include/SDL_keyboard.h \ ../../../../include/SDL_keysym.h \ ../../../../include/SDL_loadso.h \ - ../../../../include/SDL_main.h \ ../../../../include/SDL_mouse.h \ ../../../../include/SDL_mutex.h \ ../../../../include/SDL_quit.h \ @@ -27,9 +27,10 @@ ../../../../include/SDL_version.h \ ../../../../include/SDL_video.h + all: $(EXPORTS) -$(EXPORTS): $(HEADERS) +$(EXPORTS): Makefile genexp.pl $(HEADERS) perl genexp.pl $(HEADERS) >$@ || rm $@ clean: diff -r 0781906086fa -r 6c7b69218276 src/main/beos/exports/SDL.exp --- a/src/main/beos/exports/SDL.exp Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/beos/exports/SDL.exp Wed Feb 01 09:01:12 2006 +0000 @@ -86,9 +86,6 @@ _SDL_LoadObject _SDL_LoadFunction _SDL_UnloadObject -_SDL_SetModuleHandle -_SDL_RegisterApp -_SDL_InitQuickDraw _SDL_GetMouseState _SDL_GetRelativeMouseState _SDL_WarpMouse diff -r 0781906086fa -r 6c7b69218276 src/main/beos/exports/genexp.pl --- a/src/main/beos/exports/genexp.pl Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/beos/exports/genexp.pl Wed Feb 01 09:01:12 2006 +0000 @@ -2,6 +2,11 @@ # # Program to take a set of header files and generate MWCC export definitions +# Special exports to ignore for this platform +$exclude{"SDL_putenv"} = 1; +$exclude{"SDL_getenv"} = 1; +$exclude{"SDL_CreateThread_Core"} = 1; + while ( ($file = shift(@ARGV)) ) { if ( ! defined(open(FILE, $file)) ) { warn "Couldn't open $file: $!\n"; @@ -10,9 +15,12 @@ $file =~ s,.*/,,; while () { if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) { - print "_$1\n"; + if ( not $exclude{$1} ) { + print "_$1\n"; + } } } close(FILE); } -# Special exports not public in the header files + +# Special exports to include for this platform diff -r 0781906086fa -r 6c7b69218276 src/main/macos/exports/Makefile --- a/src/main/macos/exports/Makefile Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/macos/exports/Makefile Wed Feb 01 09:01:12 2006 +0000 @@ -30,7 +30,7 @@ all: $(EXPORTS) -$(EXPORTS): $(HEADERS) +$(EXPORTS): Makefile gendef.pl $(HEADERS) perl gendef.pl $(HEADERS) >$@ || rm $@ clean: diff -r 0781906086fa -r 6c7b69218276 src/main/macos/exports/gendef.pl --- a/src/main/macos/exports/gendef.pl Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/macos/exports/gendef.pl Wed Feb 01 09:01:12 2006 +0000 @@ -2,6 +2,9 @@ # # Program to take a set of header files and generate DLL export definitions +# Special exports to ignore for this platform +$exclude{"SDL_CreateThread_Core"} = 1; + while ( ($file = shift(@ARGV)) ) { if ( ! defined(open(FILE, $file)) ) { warn "Couldn't open $file: $!\n"; @@ -11,10 +14,13 @@ $file =~ s,.*/,,; while () { if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) { - print "\t$1\n"; + if ( not $exclude{$1} ) { + print "\t$1\n"; + } } } close(FILE); } -# Special exports not in the header files + +# Special exports to include for this platform print "\tSDL_InitQuickDraw\n"; diff -r 0781906086fa -r 6c7b69218276 src/main/macosx/exports/Makefile --- a/src/main/macosx/exports/Makefile Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/macosx/exports/Makefile Wed Feb 01 09:01:12 2006 +0000 @@ -11,6 +11,7 @@ ../../../../include/SDL_endian.h \ ../../../../include/SDL_error.h \ ../../../../include/SDL_events.h \ + ../../../../include/SDL_getenv.h \ ../../../../include/SDL_joystick.h \ ../../../../include/SDL_keyboard.h \ ../../../../include/SDL_keysym.h \ @@ -29,7 +30,7 @@ all: $(EXPORTS) -$(EXPORTS): $(HEADERS) +$(EXPORTS): Makefile gendef.pl $(HEADERS) perl gendef.pl $(HEADERS) >$@ || rm $@ clean: diff -r 0781906086fa -r 6c7b69218276 src/main/macosx/exports/SDL.x --- a/src/main/macosx/exports/SDL.x Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/macosx/exports/SDL.x Wed Feb 01 09:01:12 2006 +0000 @@ -1,5 +1,3 @@ - .objc_class_name_SDL_QuartzWindow - .objc_class_name_SDL_QuartzWindowDelegate _SDL_Init _SDL_InitSubSystem _SDL_QuitSubSystem @@ -188,3 +186,5 @@ _SDL_WM_ToggleFullScreen _SDL_WM_GrabInput _SDL_SoftStretch + .objc_class_name_SDL_QuartzWindow + .objc_class_name_SDL_QuartzWindowDelegate diff -r 0781906086fa -r 6c7b69218276 src/main/macosx/exports/gendef.pl --- a/src/main/macosx/exports/gendef.pl Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/macosx/exports/gendef.pl Wed Feb 01 09:01:12 2006 +0000 @@ -2,21 +2,27 @@ # # Program to take a set of header files and generate DLL export definitions -# print objective-c exports -print "\t.objc_class_name_SDL_QuartzWindow\n"; -print "\t.objc_class_name_SDL_QuartzWindowDelegate\n"; +# Special exports to ignore for this platform +$exclude{"SDL_putenv"} = 1; +$exclude{"SDL_getenv"} = 1; +$exclude{"SDL_CreateThread_Core"} = 1; while ( ($file = shift(@ARGV)) ) { if ( ! defined(open(FILE, $file)) ) { warn "Couldn't open $file: $!\n"; next; } - $printed_header = 0; $file =~ s,.*/,,; while () { if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) { - print "\t_$1\n"; + if ( not $exclude{$1} ) { + print "\t_$1\n"; + } } } close(FILE); } + +# Special exports to include for this platform +print "\t.objc_class_name_SDL_QuartzWindow\n"; +print "\t.objc_class_name_SDL_QuartzWindowDelegate\n"; diff -r 0781906086fa -r 6c7b69218276 src/main/win32/exports/Makefile --- a/src/main/win32/exports/Makefile Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/win32/exports/Makefile Wed Feb 01 09:01:12 2006 +0000 @@ -11,11 +11,11 @@ ../../../../include/SDL_endian.h \ ../../../../include/SDL_error.h \ ../../../../include/SDL_events.h \ + ../../../../include/SDL_getenv.h \ ../../../../include/SDL_joystick.h \ ../../../../include/SDL_keyboard.h \ ../../../../include/SDL_keysym.h \ ../../../../include/SDL_loadso.h \ - ../../../../include/SDL_main.h \ ../../../../include/SDL_mouse.h \ ../../../../include/SDL_mutex.h \ ../../../../include/SDL_quit.h \ @@ -30,7 +30,7 @@ all: $(EXPORTS) -$(EXPORTS): $(HEADERS) +$(EXPORTS): Makefile gendef.pl $(HEADERS) perl gendef.pl $(HEADERS) >$@ || rm $@ clean: diff -r 0781906086fa -r 6c7b69218276 src/main/win32/exports/SDL.def --- a/src/main/win32/exports/SDL.def Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/win32/exports/SDL.def Wed Feb 01 09:01:12 2006 +0000 @@ -61,6 +61,8 @@ SDL_SetEventFilter SDL_GetEventFilter SDL_EventState + SDL_putenv + SDL_getenv SDL_NumJoysticks SDL_JoystickName SDL_JoystickOpen @@ -86,9 +88,6 @@ SDL_LoadObject SDL_LoadFunction SDL_UnloadObject - SDL_SetModuleHandle - SDL_RegisterApp - SDL_InitQuickDraw SDL_GetMouseState SDL_GetRelativeMouseState SDL_WarpMouse @@ -191,3 +190,4 @@ SDL_SoftStretch SDL_RegisterApp SDL_SetModuleHandle + SDL_UnregisterApp diff -r 0781906086fa -r 6c7b69218276 src/main/win32/exports/gendef.pl --- a/src/main/win32/exports/gendef.pl Wed Feb 01 08:24:32 2006 +0000 +++ b/src/main/win32/exports/gendef.pl Wed Feb 01 09:01:12 2006 +0000 @@ -2,20 +2,26 @@ # # Program to take a set of header files and generate DLL export definitions +# Special exports to ignore for this platform +$exclude{"SDL_CreateThread_Core"} = 1; + while ( ($file = shift(@ARGV)) ) { if ( ! defined(open(FILE, $file)) ) { warn "Couldn't open $file: $!\n"; next; } - $printed_header = 0; $file =~ s,.*/,,; while () { if ( / DECLSPEC.* SDLCALL ([^\s\(]+)/ ) { - print "\t$1\n"; + if ( not $exclude{$1} ) { + print "\t$1\n"; + } } } close(FILE); } -# Special exports not in the header files + +# Special exports to include for this platform print "\tSDL_RegisterApp\n"; print "\tSDL_SetModuleHandle\n"; +print "\tSDL_UnregisterApp\n";