TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix compile errors when building on Mac OS 9 using SDL 1.2.10 (conflicting macros, use of putenv)

Browse source
This commit is contained in:
kreatordxx 2006-12-25 13:59:28 +00:00
parent ed899e7b5e
commit 1437f3d2bc
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/carbon/SDL_main.c
View file

@ -500,11 +500,11 @@ int main(int argc, char *argv[])
/* Set pseudo-environment variables for video driver, update prefs */
switch ( videodriver ) {
case VIDEO_ID_DRAWSPROCKET:
putenv ("SDL_VIDEODRIVER=DSp");
SDL_putenv ("SDL_VIDEODRIVER=DSp");
memcpy (prefs.video_driver_name, "\pDSp", 4);
break;
case VIDEO_ID_TOOLBOX:
putenv ("SDL_VIDEODRIVER=toolbox");
SDL_putenv ("SDL_VIDEODRIVER=toolbox");
memcpy (prefs.video_driver_name, "\ptoolbox", 8);
break;
}

28
arch/carbon/conf.h
View file

@ -25,28 +25,28 @@
/* Define to 1 if you have the declaration of `nanosleep', and to 0 if you
don't. */
#define HAVE_DECL_NANOSLEEP 1
//#define HAVE_DECL_NANOSLEEP 1
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
//#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
//#define HAVE_MEMORY_H 1
/* Define to 1 if you have the <netipx/ipx.h> header file. */
/* #undef HAVE_NETIPX_IPX_H */
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
//#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
//#define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
//#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
//#define HAVE_STRING_H 1
/* Define if you want to build for mac datafiles */
//#define MACDATA
@ -88,7 +88,7 @@
#define SHAREPATH "/Users/christaylor/share/games/d2x"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
//#define STDC_HEADERS 1
/* Define if you want an SVGALib build */
/* #undef SVGA */
@ -132,13 +132,13 @@
#define HAVE_STRUCT_TIMEVAL 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
//#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
//#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
//#define HAVE_UNISTD_H 1
#else // Mac OS 9
# ifndef __MWERKS__
@ -155,13 +155,13 @@
#define HAVE_STRUCT_TIMEVAL 0
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 0
//#define HAVE_SYS_STAT_H 0
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 0
//#define HAVE_SYS_TYPES_H 0
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 0
//#define HAVE_UNISTD_H 0
#endif // OS 9/X

1
dxx-changelog.txt
View file

@ -3,6 +3,7 @@ D2X-Rebirth Changelog
20061225
--------
main/titles.c: fix crash where loading screen function is called before video mode is set (when SDL Video is used as well as -notitles)
arch/carbon/conf.h, arch/carbon/SDL_main.c: fix compile errors when building on Mac OS 9 using SDL 1.2.10 (conflicting macros, use of putenv)
20061224
--------