|
@@ -25,11 +25,13 @@
|
|
# include <SDL_main.h>
|
|
# include <SDL_main.h>
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#ifdef HL_WIN_DESKTOP
|
|
|
|
|
|
+#if defined(HL_WIN_DESKTOP) || defined(HL_XBS)
|
|
# pragma warning(disable:4091)
|
|
# pragma warning(disable:4091)
|
|
-# undef _GUID
|
|
|
|
-# define WIN32_LEAN_AND_MEAN
|
|
|
|
-# include <windows.h>
|
|
|
|
|
|
+# undef _GUID
|
|
|
|
+#ifndef WIN32_LEAN_AND_MEAN
|
|
|
|
+# define WIN32_LEAN_AND_MEAN
|
|
|
|
+#endif
|
|
|
|
+# include <windows.h>
|
|
#if !defined(HL_MINGW)
|
|
#if !defined(HL_MINGW)
|
|
# include <DbgHelp.h>
|
|
# include <DbgHelp.h>
|
|
#else
|
|
#else
|
|
@@ -148,7 +150,7 @@ static int hlc_capture_stack( void **stack, int size ) {
|
|
return count;
|
|
return count;
|
|
}
|
|
}
|
|
|
|
|
|
-#ifdef HL_WIN_DESKTOP
|
|
|
|
|
|
+#if defined(HL_WIN_DESKTOP) || defined(HL_XBS)
|
|
int wmain(int argc, uchar *argv[]) {
|
|
int wmain(int argc, uchar *argv[]) {
|
|
#else
|
|
#else
|
|
int main(int argc, char *argv[]) {
|
|
int main(int argc, char *argv[]) {
|
|
@@ -178,12 +180,8 @@ int main(int argc, char *argv[]) {
|
|
return (int)isExc;
|
|
return (int)isExc;
|
|
}
|
|
}
|
|
|
|
|
|
-#if defined(HL_WIN_DESKTOP) && !defined(_CONSOLE)
|
|
|
|
|
|
+#if (defined(HL_WIN_DESKTOP) && !defined(_CONSOLE)) || defined(HL_XBS)
|
|
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdLine, int nCmdShow) {
|
|
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdLine, int nCmdShow) {
|
|
return wmain(__argc, __wargv);
|
|
return wmain(__argc, __wargv);
|
|
}
|
|
}
|
|
-#elif defined(HL_XBS)
|
|
|
|
-int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
|
|
|
|
- return main(__argc, __argv);
|
|
|
|
-}
|
|
|
|
#endif
|
|
#endif
|