Removed some more EPOC stuff I missed. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Fri, 15 Jun 2007 15:52:04 +0000
branchSDL-1.2
changeset 3969e6112676c9a0
parent 3968 ae0be7edf7d0
child 3970 203695f768e0
Removed some more EPOC stuff I missed.
Makefile.in
docs/html/sdlenvvars.html
src/main/epoc/SDL_main.cpp
     1.1 --- a/Makefile.in	Fri Jun 15 15:42:15 2007 +0000
     1.2 +++ b/Makefile.in	Fri Jun 15 15:52:04 2007 +0000
     1.3 @@ -38,7 +38,7 @@
     1.4  SDLMAIN_SOURCES = @SDLMAIN_SOURCES@
     1.5  SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
     1.6  
     1.7 -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
     1.8 +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
     1.9  
    1.10  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
    1.11  
     2.1 --- a/docs/html/sdlenvvars.html	Fri Jun 15 15:42:15 2007 +0000
     2.2 +++ b/docs/html/sdlenvvars.html	Fri Jun 15 15:52:04 2007 +0000
     2.3 @@ -436,21 +436,6 @@
     2.4  VALIGN="TOP"
     2.5  ><TT
     2.6  CLASS="LITERAL"
     2.7 ->epoc</TT
     2.8 -></TD
     2.9 -><TD
    2.10 -ALIGN="LEFT"
    2.11 -VALIGN="TOP"
    2.12 -><P
    2.13 ->(Epoc)</P
    2.14 -></TD
    2.15 -></TR
    2.16 -><TR
    2.17 -><TD
    2.18 -ALIGN="LEFT"
    2.19 -VALIGN="TOP"
    2.20 -><TT
    2.21 -CLASS="LITERAL"
    2.22  >dummy</TT
    2.23  ></TD
    2.24  ><TD
     3.1 --- a/src/main/epoc/SDL_main.cpp	Fri Jun 15 15:42:15 2007 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,129 +0,0 @@
     3.4 -/*
     3.5 -    SDL - Simple DirectMedia Layer
     3.6 -    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga
     3.7 -
     3.8 -    This library is free software; you can redistribute it and/or
     3.9 -    modify it under the terms of the GNU Library General Public
    3.10 -    License as published by the Free Software Foundation; either
    3.11 -    version 2 of the License, or (at your option) any later version.
    3.12 -
    3.13 -    This library is distributed in the hope that it will be useful,
    3.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    3.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    3.16 -    Library General Public License for more details.
    3.17 -
    3.18 -    You should have received a copy of the GNU Library General Public
    3.19 -    License along with this library; if not, write to the Free
    3.20 -    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    3.21 -
    3.22 -    Sam Lantinga
    3.23 -    slouken@libsdl.org
    3.24 -*/
    3.25 -
    3.26 -/*
    3.27 -    SDL_main.cpp
    3.28 -    The Epoc executable startup functions 
    3.29 -
    3.30 -    Epoc version by Hannu Viitala (hannu.j.viitala@mbnet.fi)
    3.31 -*/
    3.32 -
    3.33 -#include <e32std.h>
    3.34 -#include <e32def.h>
    3.35 -#include <e32svr.h>
    3.36 -#include <e32base.h>
    3.37 -#include <estlib.h>
    3.38 -#include <stdlib.h>
    3.39 -#include <stdio.h>
    3.40 -#include <w32std.h>
    3.41 -#include <apgtask.h>
    3.42 -
    3.43 -#include "SDL_error.h"
    3.44 -
    3.45 -#ifndef EXPORT_C
    3.46 -# ifdef __VC32__
    3.47 -#  define IMPORT_C __declspec(dllexport)
    3.48 -#  define EXPORT_C __declspec(dllexport)
    3.49 -# endif
    3.50 -# ifdef __GCC32__
    3.51 -#  define IMPORT_C
    3.52 -#  define EXPORT_C __declspec(dllexport)
    3.53 -# endif
    3.54 -#endif
    3.55 -
    3.56 -#if defined(__WINS__)
    3.57 -#include <estw32.h>
    3.58 -IMPORT_C void RegisterWsExe(const TDesC &aName);
    3.59 -#endif
    3.60 -
    3.61 -/* The prototype for the application's main() function */
    3.62 -#define main	SDL_main
    3.63 -extern "C" int main (int argc, char *argv[], char *envp[]);
    3.64 -extern "C" void exit (int ret);
    3.65 -
    3.66 -
    3.67 -/* Epoc main function */
    3.68 -
    3.69 -GLDEF_C TInt E32Main() 
    3.70 -    {
    3.71 -    /*  Get the clean-up stack */
    3.72 -	CTrapCleanup* cleanup = CTrapCleanup::New();
    3.73 -
    3.74 -    #if defined(__WINS__)
    3.75 -    /* arrange for access to Win32 stdin/stdout/stderr */
    3.76 -   	RWin32Stream::StartServer();	
    3.77 -    #endif
    3.78 -
    3.79 -    /* Arrange for multi-threaded operation */
    3.80 -	SpawnPosixServerThread();	
    3.81 -
    3.82 -    /* Get args and environment */
    3.83 -	int argc=0;
    3.84 -	char** argv=0;
    3.85 -	char** envp=0;
    3.86 -	__crt0(argc,argv,envp);	
    3.87 -
    3.88 -    #if defined(__WINS__)
    3.89 -	/* Cause the graphical Window Server to come into existence */
    3.90 -	RSemaphore sem;
    3.91 -	sem.CreateGlobal(_L("WsExeSem"),0);
    3.92 -	RegisterWsExe(sem.FullName());
    3.93 -    #endif
    3.94 -
    3.95 -
    3.96 -    /* Start the application! */
    3.97 -
    3.98 -    /* Create stdlib */
    3.99 -    _REENT;
   3.100 -
   3.101 -    /* Set process and thread priority */
   3.102 -    RThread currentThread;
   3.103 -
   3.104 -    currentThread.Rename(_L("SdlProgram"));
   3.105 -    currentThread.SetProcessPriority(EPriorityLow);
   3.106 -    currentThread.SetPriority(EPriorityMuchLess);
   3.107 -
   3.108 -    /* Call stdlib main */
   3.109 -    int ret = main(argc, argv, envp); /* !! process exits here if there is "exit()" in main! */	
   3.110 -
   3.111 -    /* Call exit */
   3.112 -    exit(ret); /* !! process exits here! */			
   3.113 -
   3.114 -    /* Free resources and return */
   3.115 -    CloseSTDLIB();
   3.116 -   	delete cleanup;									
   3.117 -    return(KErrNone);
   3.118 -    }
   3.119 -
   3.120 -/* Epoc dll entry point */
   3.121 -#if defined(__WINS__)
   3.122 -GLDEF_C TInt E32Dll(TDllReason)
   3.123 -	{
   3.124 -	return(KErrNone);
   3.125 -	}
   3.126 -
   3.127 -EXPORT_C TInt WinsMain(TAny *)
   3.128 -	{
   3.129 -    E32Main();
   3.130 -	return KErrNone;
   3.131 -	}
   3.132 -#endif