changeset 3969:e6112676c9a0 SDL-1.2

Removed some more EPOC stuff I missed.
author Ryan C. Gordon <icculus@icculus.org>
date Fri, 15 Jun 2007 15:52:04 +0000
parents ae0be7edf7d0
children 203695f768e0
files Makefile.in docs/html/sdlenvvars.html src/main/epoc/SDL_main.cpp
diffstat 3 files changed, 1 insertions(+), 145 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Fri Jun 15 15:42:15 2007 +0000
+++ b/Makefile.in	Fri Jun 15 15:52:04 2007 +0000
@@ -38,7 +38,7 @@
 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
 
--- a/docs/html/sdlenvvars.html	Fri Jun 15 15:42:15 2007 +0000
+++ b/docs/html/sdlenvvars.html	Fri Jun 15 15:52:04 2007 +0000
@@ -436,21 +436,6 @@
 VALIGN="TOP"
 ><TT
 CLASS="LITERAL"
->epoc</TT
-></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->(Epoc)</P
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><TT
-CLASS="LITERAL"
 >dummy</TT
 ></TD
 ><TD
--- a/src/main/epoc/SDL_main.cpp	Fri Jun 15 15:42:15 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/*
-    SDL_main.cpp
-    The Epoc executable startup functions 
-
-    Epoc version by Hannu Viitala (hannu.j.viitala@mbnet.fi)
-*/
-
-#include <e32std.h>
-#include <e32def.h>
-#include <e32svr.h>
-#include <e32base.h>
-#include <estlib.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <w32std.h>
-#include <apgtask.h>
-
-#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 <estw32.h>
-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