diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-08-02 12:17:54 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-08-02 12:17:54 +0000 |
| commit | 714d6ffa2ba990e61e6751e3080d4002fd91936f (patch) | |
| tree | f4516606e5d989d11cacfd40c1b57b0c22ece3f8 | |
| parent | 75eeb11c1e7731dafb78319e98f7f9cfe5d2b0c8 (diff) | |
| download | rockbox-714d6ffa2ba990e61e6751e3080d4002fd91936f.zip rockbox-714d6ffa2ba990e61e6751e3080d4002fd91936f.tar.gz rockbox-714d6ffa2ba990e61e6751e3080d4002fd91936f.tar.bz2 rockbox-714d6ffa2ba990e61e6751e3080d4002fd91936f.tar.xz | |
Mingw compile adjustments. Mostly from Bill Napier.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1521 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | uisimulator/win32/stdbool.h | 25 | ||||
| -rw-r--r-- | uisimulator/win32/string-win32.c | 6 | ||||
| -rw-r--r-- | uisimulator/win32/uisw32.c | 6 | ||||
| -rw-r--r-- | uisimulator/win32/uisw32.rc | 4 |
4 files changed, 38 insertions, 3 deletions
diff --git a/uisimulator/win32/stdbool.h b/uisimulator/win32/stdbool.h index 769d7ac..d91ef37 100644 --- a/uisimulator/win32/stdbool.h +++ b/uisimulator/win32/stdbool.h @@ -17,7 +17,30 @@ * ****************************************************************************/ +#ifndef __STDBOOL_H__ +#define __STDBOOL_H__ 1 + +#ifndef __MINGW32__ typedef unsigned int bool; +#define __attribute__(s) + #define true 1 #define false 0 -#define __attribute__(s)
\ No newline at end of file +#else + +typedef enum +{ + false = 0, + true = 1 +} bool; + +#define false false +#define true true + +/* Signal that all the definitions are present. */ +#define __bool_true_false_are_defined 1 + +#endif + +#endif /* __STDBOOL_H__ */ + diff --git a/uisimulator/win32/string-win32.c b/uisimulator/win32/string-win32.c index 9e10f0e..bf81fd1 100644 --- a/uisimulator/win32/string-win32.c +++ b/uisimulator/win32/string-win32.c @@ -17,6 +17,8 @@ * ****************************************************************************/ +#ifndef __MINGW32__ + #include <string.h> int strcasecmp (const char *a, const char *b) @@ -27,4 +29,6 @@ int strcasecmp (const char *a, const char *b) int strncasecmp (const char *a, const char *b) { return strcmpi (a, b); -}
\ No newline at end of file +} + +#endif diff --git a/uisimulator/win32/uisw32.c b/uisimulator/win32/uisw32.c index 2661d74..a491dec 100644 --- a/uisimulator/win32/uisw32.c +++ b/uisimulator/win32/uisw32.c @@ -26,6 +26,10 @@ #include "thread-win32.h" #include "kernel.h" +#ifndef LR_VGACOLOR /* Should be under MINGW32 builds? */ +#define LR_VGACOLOR LR_COLOR +#endif + // extern functions extern void app_main (void *); // mod entry point extern void new_key(int key); @@ -298,4 +302,4 @@ int WINAPI WinMain ( GUIMessageLoop (); return GUIDown (); -}
\ No newline at end of file +} diff --git a/uisimulator/win32/uisw32.rc b/uisimulator/win32/uisw32.rc index 42f5e6f..6787c26 100644 --- a/uisimulator/win32/uisw32.rc +++ b/uisimulator/win32/uisw32.rc @@ -7,7 +7,9 @@ // // Generated from the TEXTINCLUDE 2 resource. // +#ifndef __MINGW32__ #include "afxres.h" +#endif ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -17,7 +19,9 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 +#ifndef __MINGW32__ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#endif #pragma code_page(1252) #endif //_WIN32 |