From 8f86a8a8a59b9173e95f6ceb12a630588cf83114 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 25 Jul 2008 00:36:18 +0200 Subject: [PATCH] Merge sdlexe into main SDL library. --- symbian/bld.inf | 4 ---- symbian/sdl.mmp | 15 +++++++++++---- symbian/sdlexe.mmp | 16 ---------------- 3 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 symbian/sdlexe.mmp diff --git a/symbian/bld.inf b/symbian/bld.inf index 159faf0..2138c17 100644 --- a/symbian/bld.inf +++ b/symbian/bld.inf @@ -1,9 +1,5 @@ PRJ_MMPFILES -//gnumakefile sdl_s60.mk sdl.mmp -sdlexe.mmp -//sdlmain.mmp -//sdlmaint.mmp PRJ_EXPORTS include/sdlepocapi.h diff --git a/symbian/sdl.mmp b/symbian/sdl.mmp index c121511..e603c3d 100644 --- a/symbian/sdl.mmp +++ b/symbian/sdl.mmp @@ -1,8 +1,14 @@ -TARGET sdl.lib -TARGETTYPE lib +TARGET sdl.lib +TARGETTYPE lib -MACRO DISABLE_JOYSTICK -MACRO DISABLE_CDROM +MACRO DISABLE_JOYSTICK +MACRO DISABLE_CDROM + +SOURCEPATH src +START RESOURCE sdlexe.rss +HEADER +TARGETPATH \resource\apps +END SOURCEPATH ..\src @@ -27,6 +33,7 @@ SOURCE file/SDL_rwops.c SOURCE main/symbian/SDL_env.cpp SOURCE main/symbian/SDL_main.cpp SOURCE main/symbian/debug.cpp +SOURCE main/symbian/sdlexe.cpp SOURCE stdlib/SDL_getenv.c SOURCE stdlib/SDL_string.c SOURCE thread/generic/SDL_syscond.c diff --git a/symbian/sdlexe.mmp b/symbian/sdlexe.mmp deleted file mode 100644 index eea354f..0000000 --- a/symbian/sdlexe.mmp +++ /dev/null @@ -1,16 +0,0 @@ -TARGET sdlexe.lib -TARGETTYPE lib - -SOURCEPATH ..\src\main\symbian -SOURCE sdlexe.cpp - -SOURCEPATH src -START RESOURCE sdlexe.rss -HEADER -TARGETPATH \resource\apps -END - -SYSTEMINCLUDE \epoc32\include - -USERINCLUDE ..\src\main\symbian -USERINCLUDE include\internal -- 2.11.4.GIT