Author: cwittich Date: Sat Jul 14 03:19:04 2007 New Revision: 27641
URL: http://svn.reactos.org/svn/reactos?rev=27641&view=rev Log: -fix some linux build issues
Modified: trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/sysreg/user_types.h
Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?r... ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Sat Jul 14 03:19:04 2007 @@ -10,7 +10,7 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */
-#if 1 +#ifndef __LINUX__ #include <windows.h> #else #include <unistd.h>
Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?rev... ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Sat Jul 14 03:19:04 2007 @@ -48,9 +48,9 @@
ifeq ($(HOST),mingw32-linux) -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -D__LINUX__ -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude/reactos/libs +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__LINUX__ else -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude/reactos/libs +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$(INTERMEDIATE_)$(SEP)include$(SEP)psdk endif
SYSREGBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)
Modified: trunk/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?r... ============================================================================== --- trunk/reactos/tools/sysreg/user_types.h (original) +++ trunk/reactos/tools/sysreg/user_types.h Sat Jul 14 03:19:04 2007 @@ -11,8 +11,24 @@ */
#include <string> -#include <tchar.h> #include <iostream> + +#ifndef __LINUX__ + #include <tchar.h> +#else + #define TCHAR char + #define tstrcpy strcpy + #define _tcscat strcat + #define _tcscpy(str1, str2) strcpy(str1, str2) + #define _tcslen(str1) strlen(str1) + #define _tcstod strtod + #define _tcscmp strcmp + #define _tcstoul strtoul + #define _tcsncmp strncmp + #define _tremove remove + #define _ttoi atoi + #define _T(x) x +#endif
typedef std::basic_string<TCHAR> string; typedef std::basic_istringstream<TCHAR> istringstream;