From f913506592202a53a07dd6ed4c327787442d3c9b Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 15 Jun 2007 15:52:04 +0000 Subject: [PATCH] Removed some more EPOC stuff I missed. --- Makefile.in | 2 +- docs/html/sdlenvvars.html | 15 ----- src/main/epoc/SDL_main.cpp | 129 ------------------------------------- 3 files changed, 1 insertion(+), 145 deletions(-) delete mode 100644 src/main/epoc/SDL_main.cpp diff --git a/Makefile.in b/Makefile.in index 6d18f3791..81a18f65d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,7 +38,7 @@ SDLMAIN_TARGET = libSDLmain.a SDLMAIN_SOURCES = @SDLMAIN_SOURCES@ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ -DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html EpocBuildFiles.zip include INSTALL Makefile.dc Makefile.minimal Makefile.in MPWmake.sea.bin README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom-OS2.zip Watcom-Win32.zip WhatsNew Xcode.tar.gz +DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html include INSTALL Makefile.dc Makefile.minimal Makefile.in MPWmake.sea.bin README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom-OS2.zip Watcom-Win32.zip WhatsNew Xcode.tar.gz HDRS = SDL.h SDL_active.h SDL_audio.h SDL_byteorder.h SDL_cdrom.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_getenv.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_platform.h SDL_quit.h SDL_rwops.h SDL_stdinc.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h diff --git a/docs/html/sdlenvvars.html b/docs/html/sdlenvvars.html index 6b4ca3b28..4e677cdc8 100644 --- a/docs/html/sdlenvvars.html +++ b/docs/html/sdlenvvars.html @@ -436,21 +436,6 @@ VALIGN="TOP" >epoc

(Epoc)

dummy -#include -#include -#include -#include -#include -#include -#include -#include - -#include "SDL_error.h" - -#ifndef EXPORT_C -# ifdef __VC32__ -# define IMPORT_C __declspec(dllexport) -# define EXPORT_C __declspec(dllexport) -# endif -# ifdef __GCC32__ -# define IMPORT_C -# define EXPORT_C __declspec(dllexport) -# endif -#endif - -#if defined(__WINS__) -#include -IMPORT_C void RegisterWsExe(const TDesC &aName); -#endif - -/* The prototype for the application's main() function */ -#define main SDL_main -extern "C" int main (int argc, char *argv[], char *envp[]); -extern "C" void exit (int ret); - - -/* Epoc main function */ - -GLDEF_C TInt E32Main() - { - /* Get the clean-up stack */ - CTrapCleanup* cleanup = CTrapCleanup::New(); - - #if defined(__WINS__) - /* arrange for access to Win32 stdin/stdout/stderr */ - RWin32Stream::StartServer(); - #endif - - /* Arrange for multi-threaded operation */ - SpawnPosixServerThread(); - - /* Get args and environment */ - int argc=0; - char** argv=0; - char** envp=0; - __crt0(argc,argv,envp); - - #if defined(__WINS__) - /* Cause the graphical Window Server to come into existence */ - RSemaphore sem; - sem.CreateGlobal(_L("WsExeSem"),0); - RegisterWsExe(sem.FullName()); - #endif - - - /* Start the application! */ - - /* Create stdlib */ - _REENT; - - /* Set process and thread priority */ - RThread currentThread; - - currentThread.Rename(_L("SdlProgram")); - currentThread.SetProcessPriority(EPriorityLow); - currentThread.SetPriority(EPriorityMuchLess); - - /* Call stdlib main */ - int ret = main(argc, argv, envp); /* !! process exits here if there is "exit()" in main! */ - - /* Call exit */ - exit(ret); /* !! process exits here! */ - - /* Free resources and return */ - CloseSTDLIB(); - delete cleanup; - return(KErrNone); - } - -/* Epoc dll entry point */ -#if defined(__WINS__) -GLDEF_C TInt E32Dll(TDllReason) - { - return(KErrNone); - } - -EXPORT_C TInt WinsMain(TAny *) - { - E32Main(); - return KErrNone; - } -#endif