Bug 4945 - MSVC compile update
Status: RESOLVED FIXED
Alias: None
Product: ioquake3
Classification: Unclassified
Component: Platform
Version: GIT MASTER
Hardware: PC Windows XP
: P3 critical
Assignee: Zachary J. Slater
QA Contact: ioquake3 bugzilla mailing list
URL:
Depends on:
Blocks:
 
Reported: 2011-03-31 01:49 EDT by adamix
Modified: 2011-06-06 17:15:56 EDT
2 users (show)

See Also:


Attachments
patch (359.64 KB, patch)
2011-03-31 01:49 EDT, adamix
Define for MSVC in jconfig.h (473 bytes, patch)
2011-05-16 19:50 EDT, Guillaume Bougard
merged the previous patches (32.65 KB, patch)
2011-05-17 18:57 EDT, cyrri

Description adamix 2011-03-31 01:49:47 EDT
Created attachment 2650 [details]
patch

The update for .sln/.vcproj for 2008 version of Visual Studio, small compile fix for libjpeg.
Comment 1 cyrri 2011-04-27 17:35:39 EDT
The compiler errors are fixed but the built engine crashes at startup with "Client fatal crashed: JPEG parameter struct mismatch: library thinks size is 448, caller expects 488".
I don't think it's due to this patch, because my own attempt ended with the exact same error. Can anyone confirm this? I use VS 2008 on a 32bit Windows 7.
Comment 2 adamix 2011-04-27 22:58:19 EDT
(In reply to comment #1)
> The compiler errors are fixed but the built engine crashes at startup with
> "Client fatal crashed: JPEG parameter struct mismatch: library thinks size is
> 448, caller expects 488".
> I don't think it's due to this patch, because my own attempt ended with the
> exact same error. Can anyone confirm this? I use VS 2008 on a 32bit Windows 7.

Yes, i can confirm that. It works on the mingw build.
Comment 3 Guillaume Bougard 2011-05-16 19:50:22 EDT
Created attachment 2715 [details]
Define for MSVC in jconfig.h

Hi,

I think the INLINE define should be better put in jconfig.h (see my proposed patch).

You should also add USE_INTERNAL_JPEG in the Preprocessor definitions fields. As this is the only thing you need to avoid the "JPEG parameter struct mismatch" error.

Tequila
Smokin'Guns dev team
Comment 4 cyrri 2011-05-17 18:53:42 EDT
Right, this did the trick. Attached is a patch that merges your two patches, removes the inline define from the first one, adds USE_INTERNAL_JPEG and also adds tr_model_iqm.c to the files.
Comment 5 cyrri 2011-05-17 18:57:49 EDT
Created attachment 2716 [details]
merged the previous patches

Right, this did the trick. Attached is a patch that merges your two patches, removes the inline define from the first one, adds USE_INTERNAL_JPEG and also adds tr_model_iqm.c to the files.
Comment 6 Thilo Schulz 2011-06-06 17:15:56 EDT
committed r2013, thank you.