mirror of
https://gitlab.com/shinovon/re3-symbian.git
synced 2026-05-22 17:47:20 +03:00
Changes to allow compilation. A new PKG was created for the Symbian S60v3 version
This commit is contained in:
parent
7592dde85c
commit
e747590879
3 changed files with 62 additions and 6 deletions
22
sis/re3-gles1.pkg
Normal file
22
sis/re3-gles1.pkg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
#{"GTA III"},(0xe0d67647),1,0,0
|
||||
|
||||
[0x101F7961], 0, 0, 0, {"S60ProductID"}
|
||||
[0x1028315F], 0, 0, 0, {"S60ProductID"}
|
||||
[0x20022E6D], 0, 0, 0, {"S60ProductID"}
|
||||
|
||||
%{"nnproject"}
|
||||
:"nnproject"
|
||||
|
||||
;IF (NOT package(0x20009A80)) OR (NOT package(0x2002372A)) ; old or missing openc
|
||||
; "incompatible_openc.txt"-"", FT, FORCEABORT
|
||||
;ENDIF
|
||||
|
||||
;IF exists("z:\system\install\Series60v5.2.sis") AND exists("z:\sys\bin\libGLESv2.dll")
|
||||
; "$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3.exe"-"!:\sys\bin\re3.exe"
|
||||
;ELSE
|
||||
; "$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3_gles1.exe"-"!:\sys\bin\re3.exe"
|
||||
;ENDIF
|
||||
"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3_gles1.exe"-"!:\sys\bin\re3.exe"
|
||||
"$(EPOCROOT)\epoc32\data\z\private\10003a3f\import\apps\re3_reg.rsc" - "!:\private\10003a3f\import\apps\re3_reg.rsc"
|
||||
"$(EPOCROOT)\epoc32\data\z\resource\apps\re3.rsc" - "!:\resource\apps\re3.rsc"
|
||||
"$(EPOCROOT)\epoc32\data\z\resource\apps\re3_icon.mif" - "!:\resource\apps\re3_icon.mif"
|
||||
32
vendor/librw/src/gl/gl3immed.cpp
vendored
32
vendor/librw/src/gl/gl3immed.cpp
vendored
|
|
@ -113,10 +113,18 @@ im2DRenderPrimitive(PrimitiveType primType, void *vertices, int32 numVertices)
|
|||
glVertexAttribPointer(ATTRIB_POS, 4, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + 0);
|
||||
|
||||
glEnableVertexAttribArray(ATTRIB_COLOR);
|
||||
#ifdef __SYMBIAN32__
|
||||
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, r));
|
||||
#else
|
||||
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im2DVertex), (uint8*)vertices + offsetof(Im2DVertex, r));
|
||||
#endif
|
||||
|
||||
glEnableVertexAttribArray(ATTRIB_TEXCOORDS0);
|
||||
#ifdef __SYMBIAN32__
|
||||
glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, u));
|
||||
#else
|
||||
glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + offsetof(Im2DVertex, u));
|
||||
#endif
|
||||
|
||||
glDrawArrays(primTypeMap[primType], 0, numVertices);
|
||||
|
||||
|
|
@ -146,10 +154,18 @@ im2DRenderIndexedPrimitive(PrimitiveType primType,
|
|||
glVertexAttribPointer(ATTRIB_POS, 4, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + 0);
|
||||
|
||||
glEnableVertexAttribArray(ATTRIB_COLOR);
|
||||
#ifdef __SYMBIAN32__
|
||||
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, r));
|
||||
#else
|
||||
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im2DVertex), (uint8*)vertices + offsetof(Im2DVertex, r));
|
||||
#endif
|
||||
|
||||
glEnableVertexAttribArray(ATTRIB_TEXCOORDS0);
|
||||
#ifdef __SYMBIAN32__
|
||||
glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, u));
|
||||
#else
|
||||
glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + offsetof(Im2DVertex, u));
|
||||
#endif
|
||||
|
||||
glDrawElements(primTypeMap[primType], numIndices, GL_UNSIGNED_SHORT, indices);
|
||||
|
||||
|
|
@ -216,10 +232,18 @@ im3DRenderPrimitive(PrimitiveType primType)
|
|||
glVertexAttribPointer(ATTRIB_POS, 3, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + 0);
|
||||
|
||||
glEnableVertexAttribArray(ATTRIB_COLOR);
|
||||
#ifdef __SYMBIAN32__
|
||||
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, r));
|
||||
#else
|
||||
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + offsetof(Im3DVertex, r));
|
||||
#endif
|
||||
|
||||
glEnableVertexAttribArray(ATTRIB_TEXCOORDS0);
|
||||
#ifdef __SYMBIAN32__
|
||||
glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, u));
|
||||
#else
|
||||
glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + offsetof(Im3DVertex, u));
|
||||
#endif
|
||||
|
||||
glDrawArrays(primTypeMap[primType], 0, num3DVertices);
|
||||
|
||||
|
|
@ -240,10 +264,18 @@ im3DRenderIndexedPrimitive(PrimitiveType primType, void *indices, int32 numIndic
|
|||
glVertexAttribPointer(ATTRIB_POS, 3, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + 0);
|
||||
|
||||
glEnableVertexAttribArray(ATTRIB_COLOR);
|
||||
#ifdef __SYMBIAN32__
|
||||
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, r));
|
||||
#else
|
||||
glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + offsetof(Im3DVertex, r));
|
||||
#endif
|
||||
|
||||
glEnableVertexAttribArray(ATTRIB_TEXCOORDS0);
|
||||
#ifdef __SYMBIAN32__
|
||||
glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, u));
|
||||
#else
|
||||
glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + offsetof(Im3DVertex, u));
|
||||
#endif
|
||||
|
||||
glDrawElements(primTypeMap[primType], numIndices, GL_UNSIGNED_SHORT, indices);
|
||||
|
||||
|
|
|
|||
10
vendor/librw/src/rwbase.h
vendored
10
vendor/librw/src/rwbase.h
vendored
|
|
@ -11,11 +11,13 @@
|
|||
#ifdef __SYMBIAN32__
|
||||
#undef stderr
|
||||
#define stderr stdout
|
||||
#ifdef S60V5
|
||||
#define OFFSET_OF(type, member) ((size_t)&(((type*)0)->member))
|
||||
#else
|
||||
#define OFFSET_OF offsetof
|
||||
|
||||
#ifdef OFFSET_OF
|
||||
#undef OFFSET_OF
|
||||
#endif
|
||||
|
||||
#define OFFSET_OF(type, member) \
|
||||
((size_t)((char*)&(((type*)0)->member) - (char*)0))
|
||||
#endif
|
||||
|
||||
// TODO: clean up the opengl defines
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue