Opened 13 years ago

Closed 13 years ago

Last modified 10 months ago

#2991 closed defect (fixed)

BUILD: Error on building

Reported by: (none) Owned by: SF/dsx
Priority: normal Component: Port: AmigaOS4
Keywords: Cc:
Game:

Description

Latest build:
ScummVM 0.10.0svn (Jan 6 2007 17:04:00)
Features compiled in: Vorbis FLAC MP3 zLib MPEG2

With the latest SVN co i can't go through the building process anymore, it
crashes at the AGI engine:

ppc-amigaos-g++ -MMD,"engines/agi/.deps/agi.d",-MQ,"engines/agi/agi.o",-MP -Wall -mcrt=newlib -mstrict-align -mcpu=750 -mtune=7400 -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -pedantic -Wpointer-arith -Wcast-qual -Wconversion -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor -Wno-reorder -Wwrite-strings -fno-rtti -fno-exceptions -fcheck-new -DHAVE_CONFIG_H -DDATA_PATH=\"/usr/local/share/scummvm\" -DSDL_BACKEND -DDISABLE_LURE -I. -I. -I./engines -ISDK:local/newlib/include/SDL -c engines/agi/agi.cpp -o engines/agi/agi.o
./engines/agi/agi.h:205: error: expected unqualified-id before numeric constant
engines/agi/agi.cpp: In member function 'int Agi::AgiEngine::agiInit()':
engines/agi/agi.cpp:330: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'int32'
engines/agi/agi.cpp:380: error: expected unqualified-id before numeric constant
engines/agi/agi.cpp:380: error: expected `;' before numeric constant
engines/agi/agi.cpp: In member function 'int Agi::AgiEngine::agiDetectGame()':
engines/agi/agi.cpp:447: error: expected unqualified-id before numeric constant
engines/agi/agi.cpp:447: error: expected `;' before numeric constant
gmake: *** [engines/agi/agi.o] Error 1

AmigaOS4 gcc version 4.0.2 (AmigaOS build 20051012)

With the latest build (at the top) i was able to build the exe, with the
latest commits something broke for me...

Ticket imported from: #1629835. Ticket imported from: bugs/2991.

Attachments (1)

amiga-patch.diff (1.1 KB ) - added by SF/dsx 13 years ago.
Amiga mode patch

Download all attachments as: .zip

Change History (14)

by SF/dsx, 13 years ago

Attachment: amiga-patch.diff added

Amiga mode patch

comment:1 by SF/dsx, 13 years ago

Owner: set to SF/dsx

comment:2 by SF/dsx, 13 years ago

Can you try this patch out?
File Added: amiga-patch.diff

comment:3 by (none), 13 years ago

OK, to bring this item up to date...
after talking to dsx on IRC and me trying out the patch,
i'm still stuck.
dsx requested to narrow down the revision where this
first broke, so here goes.
The revision (as i assumed in IRC already ;-)) was 25043.
25042 is working fine whereas 25043 breaks with the
aforementioned errors...

Hope this helps, as always let me know if i can do more

comment:4 by fingolfin, 13 years ago

well this looks simply as if on the amiga, the keyword "amiga" is alread used / #defined. The simple solution would appear to be renaming the "amiga" member of struct agi_options to something like "enableAmiga" (which I'd prefer anyway, for reasons of clarity).

comment:5 by fingolfin, 13 years ago

Note #1: Oops, I should have checked that patch first before saying something ;-). Anyway, vampir_raziel, are you saying that the *exact same problem* occurs with the change applied? That seems odd. Unless "amiga_mode" is being #defined, too. So, just to be sure, I just commited a patch similar to the one by dsx. You might want to "svn up", and try building again, then post the new error messages (or, if they are 100% identical to the one you already posted, just state so).

Note #2: the AGI engine does not at all conform the to the ScummVM code style specs. It would be nice if it was adapted over time, so "enableAmiga" or "amigaModer" are preferable over "amiga_mode".

comment:6 by (none), 13 years ago

I may have overlooked changing the code after the first
.diff was applied, have messed up my system a little :-)

With the applied patch and a fresh checkout it's building
again, thank you :-)

I can't add any AGI Amiga versions, though.
Is this even enabled yet?
It says it can't find any games in the dir.
The configure says AGI is set to yes... ?

comment:7 by SF/dsx, 13 years ago

The game detection is a separate issue; we haven't put in all the detection code yet.

I think this is fixed now.

comment:8 by SF/dsx, 13 years ago

Status: newpending

comment:9 by (none), 13 years ago

Status: pendingnew

comment:10 by (none), 13 years ago

@dsx

>The game detection is a separate issue; we haven't put in
>all the detection code yet.

OK

>I think this is fixed now.

It never broke after the patch, so, from my side, yes

comment:11 by (none), 13 years ago

Status: newpending

comment:12 by sev-, 13 years ago

Resolution: fixed
Status: pendingclosed

comment:13 by digitall, 10 months ago

Component: Port: AmigaOS4
Note: See TracTickets for help on using tickets.