fix some of the linux build issues

svn path=/trunk/; revision=28856
This commit is contained in:
Christoph von Wittich
2007-09-04 20:19:57 +00:00
parent 8f7e520058
commit 9487793fe7
2 changed files with 1 additions and 16 deletions
-16
View File
@@ -18,19 +18,6 @@ endif
SYSREGBUILD_TARGET = \
$(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX)
ifeq ($(HOST),mingw32-linux)
SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\
conf_parser.cpp \
env_var.cpp \
pipe_reader.cpp \
rosboot_test.cpp \
sysreg.cpp \
file_reader.cpp \
os_support.cpp \
unicode.cpp \
)
else
SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\
conf_parser.cpp \
env_var.cpp \
@@ -41,7 +28,6 @@ SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\
os_support.cpp \
unicode.cpp \
)
endif
SYSREGBUILD_OBJECTS = \
$(addprefix $(INTERMEDIATE_), $(SYSREGBUILD_SOURCES:.cpp=.o))
@@ -75,11 +61,9 @@ $(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREG
$(ECHO_CC)
${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
ifneq ($(HOST),mingw32-linux)
$(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT)
$(ECHO_CC)
${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
endif
$(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT)
$(ECHO_CC)
+1
View File
@@ -18,6 +18,7 @@
#else
#define TCHAR char
#define tstrcpy strcpy
#define _tcschr strchr
#define _tcscat strcat
#define _tcscpy(str1, str2) strcpy(str1, str2)
#define _tcslen(str1) strlen(str1)