thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed compilation and linking with msvc9

Browse source 
svn-id: r38232
This commit is contained in:
Paweł Kołodziejski 2009-02-15 12:29:09 +00:00
parent 8b34730107
commit 0724206156
5 changed files with 117 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

238
dists/msvc9/sci.vcproj
View file

@ -44,7 +44,7 @@
Optimization="0" Optimization="0"
InlineFunctionExpansion="0" InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines" AdditionalIncludeDirectories="../../;../../engines"
PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR;WANT_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
MinimalRebuild="true" MinimalRebuild="true"
ExceptionHandling="1" ExceptionHandling="1"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -120,7 +120,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="../../;../../engines" AdditionalIncludeDirectories="../../;../../engines"
PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR;WANT_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -170,11 +170,11 @@
Name="engine" Name="engine"
> >
<File <File
RelativePath="..\..\engines\sci\engine\game.c" RelativePath="..\..\engines\sci\engine\game.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\gc.c" RelativePath="..\..\engines\sci\engine\gc.cpp"
> >
</File> </File>
<File <File
@ -182,15 +182,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\include\win32\getopt.h" RelativePath="..\..\engines\sci\engine\grammar.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\grammar.c" RelativePath="..\..\engines\sci\engine\kernel.cpp"
>
</File>
<File
RelativePath="..\..\engines\sci\engine\kernel.c"
> >
</File> </File>
<File <File
@ -202,55 +198,63 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kevent.c" RelativePath="..\..\engines\sci\engine\kevent.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kfile.c" RelativePath="..\..\engines\sci\engine\kfile.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kgraphics.c" RelativePath="..\..\engines\sci\engine\kgraphics.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\klists.c" RelativePath="..\..\engines\sci\engine\klists.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kmath.c" RelativePath="..\..\engines\sci\engine\kmath.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kmenu.c" RelativePath="..\..\engines\sci\engine\kmenu.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kmovement.c" RelativePath="..\..\engines\sci\engine\kmovement.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kpathing.c" RelativePath="..\..\engines\sci\engine\kpathing.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kscripts.c" RelativePath="..\..\engines\sci\engine\kscripts.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\ksound.c" RelativePath="..\..\engines\sci\engine\ksound.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\kstring.c" RelativePath="..\..\engines\sci\engine\kstring.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\said.c" RelativePath="..\..\engines\sci\engine\message.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\savegame.c" RelativePath="..\..\engines\sci\engine\message.h"
>
</File>
<File
RelativePath="..\..\engines\sci\engine\said.cpp"
>
</File>
<File
RelativePath="..\..\engines\sci\engine\savegame.cpp"
> >
</File> </File>
<File <File
@ -258,31 +262,23 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\include\win32\sci_win32.h" RelativePath="..\..\engines\sci\engine\scriptconsole.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\scriptconsole.c" RelativePath="..\..\engines\sci\engine\scriptdebug.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\scriptdebug.c" RelativePath="..\..\engines\sci\engine\seg_manager.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\seg_manager.c" RelativePath="..\..\engines\sci\engine\sys_strings.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\engine\sys_strings.c" RelativePath="..\..\engines\sci\engine\vm.cpp"
>
</File>
<File
RelativePath="..\..\engines\sci\include\win32\usleep.h"
>
</File>
<File
RelativePath="..\..\engines\sci\engine\vm.c"
> >
</File> </File>
</Filter> </Filter>
@ -290,94 +286,94 @@
Name="gfx" Name="gfx"
> >
<File <File
RelativePath="..\..\engines\sci\gfx\antialias.c" RelativePath="..\..\engines\sci\gfx\antialias.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\font-5x8.c" RelativePath="..\..\engines\sci\gfx\font-5x8.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\font-6x10.c" RelativePath="..\..\engines\sci\gfx\font-6x10.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\font.c" RelativePath="..\..\engines\sci\gfx\font.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\gfx_res_options.c" RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\gfx_resource.c" RelativePath="..\..\engines\sci\gfx\gfx_res_options.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\gfx_support.c" RelativePath="..\..\engines\sci\gfx\gfx_resource.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\gfx_tools.c" RelativePath="..\..\engines\sci\gfx\gfx_support.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\menubar.c" RelativePath="..\..\engines\sci\gfx\gfx_tools.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\operations.c" RelativePath="..\..\engines\sci\gfx\menubar.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\resmgr.c" RelativePath="..\..\engines\sci\gfx\operations.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\sbtree.c" RelativePath="..\..\engines\sci\gfx\resmgr.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\sci_widgets.c" RelativePath="..\..\engines\sci\gfx\sbtree.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\drivers\scummvm_driver.cpp" RelativePath="..\..\engines\sci\gfx\sci_widgets.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\widgets.c" RelativePath="..\..\engines\sci\gfx\widgets.cpp"
> >
</File> </File>
<Filter <Filter
Name="resource" Name="resource"
> >
<File <File
RelativePath="..\..\engines\sci\gfx\resource\sci_cursor_0.c" RelativePath="..\..\engines\sci\gfx\resource\sci_cursor_0.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\resource\sci_font.c" RelativePath="..\..\engines\sci\gfx\resource\sci_font.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\resource\sci_pal_1.c" RelativePath="..\..\engines\sci\gfx\resource\sci_pal_1.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\resource\sci_pic_0.c" RelativePath="..\..\engines\sci\gfx\resource\sci_pic_0.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\resource\sci_resmgr.c" RelativePath="..\..\engines\sci\gfx\resource\sci_resmgr.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\resource\sci_view_0.c" RelativePath="..\..\engines\sci\gfx\resource\sci_view_0.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\gfx\resource\sci_view_1.c" RelativePath="..\..\engines\sci\gfx\resource\sci_view_1.cpp"
> >
</File> </File>
</Filter> </Filter>
@ -386,31 +382,31 @@
Name="scicore" Name="scicore"
> >
<File <File
RelativePath="..\..\engines\sci\scicore\aatree.c" RelativePath="..\..\engines\sci\scicore\aatree.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\console.c" RelativePath="..\..\engines\sci\scicore\console.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\decompress0.c" RelativePath="..\..\engines\sci\scicore\decompress0.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\decompress01.c" RelativePath="..\..\engines\sci\scicore\decompress01.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\decompress1.c" RelativePath="..\..\engines\sci\scicore\decompress1.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\decompress11.c" RelativePath="..\..\engines\sci\scicore\decompress11.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\exe.c" RelativePath="..\..\engines\sci\scicore\exe.cpp"
> >
</File> </File>
<File <File
@ -422,11 +418,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\exe_lzexe.c" RelativePath="..\..\engines\sci\scicore\exe_lzexe.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\exe_raw.c" RelativePath="..\..\engines\sci\scicore\exe_raw.cpp"
> >
</File> </File>
<File <File
@ -434,63 +430,47 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\int_hashmap.c" RelativePath="..\..\engines\sci\scicore\int_hashmap.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\reg_t_hashmap.c" RelativePath="..\..\engines\sci\scicore\reg_t_hashmap.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\resource.c" RelativePath="..\..\engines\sci\scicore\resource.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\resource_map.c" RelativePath="..\..\engines\sci\scicore\resource_map.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\resource_patch.c" RelativePath="..\..\engines\sci\scicore\resource_patch.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\sci_memory.c" RelativePath="..\..\engines\sci\scicore\sci_memory.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\script.c" RelativePath="..\..\engines\sci\scicore\script.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\tools.c" RelativePath="..\..\engines\sci\scicore\tools.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\versions.c" RelativePath="..\..\engines\sci\scicore\versions.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\vocab.c" RelativePath="..\..\engines\sci\scicore\vocab.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\scicore\vocab_debug.c" RelativePath="..\..\engines\sci\scicore\vocab_debug.cpp"
>
</File>
</Filter>
<Filter
Name="scummvm"
>
<File
RelativePath="..\..\engines\sci\scummvm\detection.cpp"
>
</File>
<File
RelativePath="..\..\engines\sci\scummvm\scummvm_engine.cpp"
>
</File>
<File
RelativePath="..\..\engines\sci\scummvm\scummvm_engine.h"
> >
</File> </File>
</Filter> </Filter>
@ -498,7 +478,7 @@
Name="sfx" Name="sfx"
> >
<File <File
RelativePath="..\..\engines\sci\sfx\adlib.c" RelativePath="..\..\engines\sci\sfx\adlib.cpp"
> >
</File> </File>
<File <File
@ -506,7 +486,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\core.c" RelativePath="..\..\engines\sci\sfx\core.cpp"
> >
</File> </File>
<File <File
@ -514,7 +494,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\iterator.c" RelativePath="..\..\engines\sci\sfx\iterator.cpp"
> >
</File> </File>
<File <File
@ -522,7 +502,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\pcm-iterator.c" RelativePath="..\..\engines\sci\sfx\pcm-iterator.cpp"
> >
</File> </File>
<File <File
@ -534,18 +514,18 @@
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\songlib.c" RelativePath="..\..\engines\sci\sfx\songlib.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\time.c" RelativePath="..\..\engines\sci\sfx\time.cpp"
> >
</File> </File>
<Filter <Filter
Name="device" Name="device"
> >
<File <File
RelativePath="..\..\engines\sci\sfx\device\devices.c" RelativePath="..\..\engines\sci\sfx\device\devices.cpp"
> >
</File> </File>
</Filter> </Filter>
@ -553,11 +533,11 @@
Name="mixer" Name="mixer"
> >
<File <File
RelativePath="..\..\engines\sci\sfx\mixer\mixers.c" RelativePath="..\..\engines\sci\sfx\mixer\mixers.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\mixer\soft.c" RelativePath="..\..\engines\sci\sfx\mixer\soft.cpp"
> >
</File> </File>
</Filter> </Filter>
@ -565,7 +545,7 @@
Name="pcm_device" Name="pcm_device"
> >
<File <File
RelativePath="..\..\engines\sci\sfx\pcm_device\pcm_devices.c" RelativePath="..\..\engines\sci\sfx\pcm_device\pcm_devices.cpp"
> >
</File> </File>
<File <File
@ -577,15 +557,15 @@
Name="player" Name="player"
> >
<File <File
RelativePath="..\..\engines\sci\sfx\player\players.c" RelativePath="..\..\engines\sci\sfx\player\players.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\player\polled.c" RelativePath="..\..\engines\sci\sfx\player\polled.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\player\realtime.c" RelativePath="..\..\engines\sci\sfx\player\realtime.cpp"
> >
</File> </File>
</Filter> </Filter>
@ -593,7 +573,7 @@
Name="seq" Name="seq"
> >
<File <File
RelativePath="..\..\engines\sci\sfx\seq\sequencers.c" RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp"
> >
</File> </File>
</Filter> </Filter>
@ -601,23 +581,27 @@
Name="softseq" Name="softseq"
> >
<File <File
RelativePath="..\..\engines\sci\sfx\softseq\amiga.c" RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\softseq\opl2.c" RelativePath="..\..\engines\sci\sfx\softseq\fmopl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\softseq\pcspeaker.c" RelativePath="..\..\engines\sci\sfx\softseq\opl2.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\softseq\SN76496.c" RelativePath="..\..\engines\sci\sfx\softseq\pcspeaker.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\softseq\softsequencers.c" RelativePath="..\..\engines\sci\sfx\softseq\SN76496.cpp"
>
</File>
<File
RelativePath="..\..\engines\sci\sfx\softseq\softsequencers.cpp"
> >
</File> </File>
</Filter> </Filter>
@ -625,11 +609,11 @@
Name="timer" Name="timer"
> >
<File <File
RelativePath="..\..\engines\sci\sfx\timer\scummvm.cpp" RelativePath="..\..\engines\sci\sfx\timer\timer_scummvm.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\engines\sci\sfx\timer\timers.c" RelativePath="..\..\engines\sci\sfx\timer\timers.cpp"
> >
</File> </File>
</Filter> </Filter>
@ -657,10 +641,6 @@
RelativePath="..\..\engines\sci\include\conf_subsystems.h" RelativePath="..\..\engines\sci\include\conf_subsystems.h"
> >
</File> </File>
<File
RelativePath="..\..\engines\sci\include\conf_summary.h"
>
</File>
<File <File
RelativePath="..\..\engines\sci\include\console.h" RelativePath="..\..\engines\sci\include\console.h"
> >
@ -749,10 +729,6 @@
RelativePath="..\..\engines\sci\include\menubar.h" RelativePath="..\..\engines\sci\include\menubar.h"
> >
</File> </File>
<File
RelativePath="..\..\engines\sci\include\modules.h"
>
</File>
<File <File
RelativePath="..\..\engines\sci\include\old_objects.h" RelativePath="..\..\engines\sci\include\old_objects.h"
> >
@ -769,10 +745,6 @@
RelativePath="..\..\engines\sci\include\sbtree.h" RelativePath="..\..\engines\sci\include\sbtree.h"
> >
</File> </File>
<File
RelativePath="..\..\engines\sci\include\sci_conf.h"
>
</File>
<File <File
RelativePath="..\..\engines\sci\include\sci_dos.h" RelativePath="..\..\engines\sci\include\sci_dos.h"
> >
@ -870,6 +842,18 @@
> >
</File> </File>
</Filter> </Filter>
<File
RelativePath="..\..\engines\sci\detection.cpp"
>
</File>
<File
RelativePath="..\..\engines\sci\sci.cpp"
>
</File>
<File
RelativePath="..\..\engines\sci\sci.h"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

2
engines/sci/engine/kmath.cpp
View file

@ -59,7 +59,7 @@ get_angle(int xrel, int yrel)
if ((xrel == 0) && (yrel == 0)) if ((xrel == 0) && (yrel == 0))
return 0; return 0;
else { else {
int val = (int) (180.0/PI * atan2((float)xrel, (float)-yrel)); int val = (int) (180.0/PI * atan2((double)xrel, (double)-yrel));
if (val < 0) if (val < 0)
val += 360; val += 360;

2
engines/sci/engine/kmovement.cpp
View file

@ -140,7 +140,7 @@ kSetJump(state_t *s, int funct_nr, int argc, reg_t *argv)
// FIXME: This choice of vy makes t roughly (2+sqrt(2))/gy * sqrt(dy); // FIXME: This choice of vy makes t roughly (2+sqrt(2))/gy * sqrt(dy);
// so if gy==3, then t is roughly sqrt(dy)... // so if gy==3, then t is roughly sqrt(dy)...
vy = (int)sqrt((float)gy * (float)abs(2 * dy)) + 1; vy = (int)sqrt((double)gy * abs(2 * dy)) + 1;
} else { } else {
// As stated above, the vertical direction is correlated to the horizontal by the // As stated above, the vertical direction is correlated to the horizontal by the
// (non-zero) factor c. // (non-zero) factor c.

3
engines/sci/scicore/resource.cpp
View file

@ -193,6 +193,7 @@ scir_add_volume(resource_mgr_t *mgr, resource_source_t *map, char *filename,
newsrc->location.file.name = strdup(filename); newsrc->location.file.name = strdup(filename);
newsrc->location.file.volume_number = number; newsrc->location.file.volume_number = number;
newsrc->associated_map = map; newsrc->associated_map = map;
return 0;
} }
resource_source_t * resource_source_t *
@ -208,6 +209,7 @@ scir_add_patch_dir(resource_mgr_t *mgr, int type, char *dirname)
newsrc->source_type = RESSOURCE_TYPE_DIRECTORY; newsrc->source_type = RESSOURCE_TYPE_DIRECTORY;
newsrc->scanned = 0; newsrc->scanned = 0;
newsrc->location.dir.name = strdup(dirname); newsrc->location.dir.name = strdup(dirname);
return 0;
} }
resource_source_t * resource_source_t *
@ -585,6 +587,7 @@ int
scir_scan_new_sources(resource_mgr_t *mgr, int *detected_version) scir_scan_new_sources(resource_mgr_t *mgr, int *detected_version)
{ {
_scir_scan_new_sources(mgr, detected_version, mgr->sources); _scir_scan_new_sources(mgr, detected_version, mgr->sources);
return 0;
} }
static void static void

2
engines/sci/scicore/tools.cpp
View file

@ -625,7 +625,7 @@ _fcaseseek(const char *fname, sci_dir_t *dir)
char *retval = NULL, *name; char *retval = NULL, *name;
#ifdef _MSC_VER #ifdef _MSC_VER
return fname; return (char *)fname;
#endif #endif
if (strchr(fname, G_DIR_SEPARATOR)) { if (strchr(fname, G_DIR_SEPARATOR)) {