From 5f33056f5ab2a0a9447aaed5cc6fa89057503bdd Mon Sep 17 00:00:00 2001 From: Shinovon Date: Sat, 9 May 2026 04:06:58 +0500 Subject: [PATCH] Fix build config --- group/common.mmh | 2 +- group/librw_gles1.mmp | 4 ++-- group/librw_gles2.mmp | 4 ++-- group/re3_gles1.mmp | 4 ++-- group/re3_gles2.mmp | 4 ++-- src/skel/symbian/symbian.cpp | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/group/common.mmh b/group/common.mmh index 1b4576d..2f816b1 100644 --- a/group/common.mmh +++ b/group/common.mmh @@ -23,7 +23,7 @@ OPTION_REPLACE ARMCC -O2 -O3 ALWAYS_BUILD_AS_ARM #endif -#ifdef SYMBIAN_3 +#ifdef __SYMBIAN_3 SYSTEMINCLUDE /epoc32/include/stdapis/stlportv5 STDCPP MACRO RW_GL3 diff --git a/group/librw_gles1.mmp b/group/librw_gles1.mmp index 0ed82e4..1564461 100644 --- a/group/librw_gles1.mmp +++ b/group/librw_gles1.mmp @@ -1,4 +1,4 @@ -#undef SYMBIAN3 -#define S60V3 +#undef __SYMBIAN3 +#define __S60V3 TARGET librw_gles1.lib #include "librw.mmh" \ No newline at end of file diff --git a/group/librw_gles2.mmp b/group/librw_gles2.mmp index b161ff5..0f854c5 100644 --- a/group/librw_gles2.mmp +++ b/group/librw_gles2.mmp @@ -1,4 +1,4 @@ -#undef S60V3 -#define SYMBIAN_3 +#undef __S60V3 +#define __SYMBIAN_3 TARGET librw_gles2.lib #include "librw.mmh" \ No newline at end of file diff --git a/group/re3_gles1.mmp b/group/re3_gles1.mmp index 79ed835..713d46e 100644 --- a/group/re3_gles1.mmp +++ b/group/re3_gles1.mmp @@ -1,5 +1,5 @@ -#undef SYMBIAN_3 -#define S60V3 +#undef __SYMBIAN_3 +#define __S60V3 //TARGET re3_gles1.exe TARGET re3_gles1.exe LIBRARY libstdcpp.lib diff --git a/group/re3_gles2.mmp b/group/re3_gles2.mmp index 90187ca..ae7782a 100644 --- a/group/re3_gles2.mmp +++ b/group/re3_gles2.mmp @@ -1,5 +1,5 @@ -#undef S60V3 -#define SYMBIAN_3 +#undef __S60V3 +#define __SYMBIAN_3 TARGET re3.exe LIBRARY libstdcppv5.lib LIBRARY libglesv2.lib diff --git a/src/skel/symbian/symbian.cpp b/src/skel/symbian/symbian.cpp index 0d8a0f5..3c9588e 100644 --- a/src/skel/symbian/symbian.cpp +++ b/src/skel/symbian/symbian.cpp @@ -515,13 +515,13 @@ public: SetFocus(ETrue); -#ifdef RW_GL3 +#ifndef S60V3 Window().EnableAdvancedPointers(); #endif EnableDragEvents(); ActivateL(); -#ifdef RW_GL3 +#ifndef S60V3 // VC4 check VersionInfo::TPlatformVersion platformVersion; VersionInfo::GetVersion(platformVersion); @@ -640,7 +640,7 @@ public: // CCoeControl::HandlePointerEventL(aPointerEvent); // return; // } -#ifdef RW_GL3 +#ifndef S60V3 const TAdvancedPointerEvent* advpointer = aPointerEvent.AdvancedPointerEvent(); int i = advpointer != NULL ? advpointer->PointerNumber() : 0; #else