This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Build ser_filter under Cygwin and don't require platform definitions
- From: John Dallaway <jld at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: Fri, 11 Apr 2003 14:02:22 +0100
- Subject: Build ser_filter under Cygwin and don't require platform definitions
- Organization: eCosCentric Limited
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/ecostest/ChangeLog,v
retrieving revision 1.15
diff -u -5 -r1.15 ChangeLog
--- ChangeLog 21 Feb 2003 21:53:19 -0000 1.15
+++ ChangeLog 11 Apr 2003 12:06:00 -0000
@@ -1,5 +1,12 @@
+2003-04-11 John Dallaway <jld at ecoscentric dot com>
+
+ * common/eCosTestPlatform.cpp (CeCosTestPlatform::Load): Return
+ true since it's not a problem if there are no platforms defined.
+
+ * unix/Makefile: Allow ser_filter to build under Cygwin.
+
2003-02-21 John Dallaway <jld at ecoscentric dot com>
* common/eCosTestPlatform.cpp (CeCosTestPlatform::Load): Allow an
extra character for string termination when retrieving registry
key names.
Index: common/eCosTestPlatform.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/ecostest/common/eCosTestPlatform.cpp,v
retrieving revision 1.5
diff -u -5 -r1.5 eCosTestPlatform.cpp
--- common/eCosTestPlatform.cpp 21 Feb 2003 21:53:19 -0000 1.5
+++ common/eCosTestPlatform.cpp 11 Apr 2003 12:06:36 -0000
@@ -186,11 +186,11 @@
}
#endif
const String strDir(CeCosTestUtils::HomeFile(_T(".eCosPlatforms")));
#ifdef _WIN32
if(!CeCosTestUtils::Exists(strDir)){
- return rc;
+ return true;
}
#endif
LoadFromDir(strDir);
if(0==Count()){
ERROR(_T("Failed to initialize any targets\n"));
Index: unix/Makefile
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/ecostest/unix/Makefile,v
retrieving revision 1.4
diff -u -5 -r1.4 Makefile
--- unix/Makefile 23 Jun 2000 17:06:32 -0000 1.4
+++ unix/Makefile 11 Apr 2003 12:07:02 -0000
@@ -23,16 +23,20 @@
programs = ser_filter
CXX=g++
-ifeq ($(shell uname), SunOS)
-# SunOS
-LIBS := -lpthread -lsocket -lxnet -lstdc++ -lposix4
-else
-# Linux
-LIBS := -lpthread -efence -lstdc++
+ifneq (,$(findstring CYGWIN, $(shell uname)))
+LIBS := -lwsock32
+endif
+
+ifneq (, $(findstring SunOS, $(shell uname)))
+LIBS := -lpthread -lsocket -lxnet -lstdc++ -lposix4
+endif
+
+ifneq (, $(findstring Linux, $(shell uname)))
+LIBS := -lpthread -efence -lstdc++
endif
# Look in these directories for source/make files
VPATH = .:../common:../../Utils/common
@@ -50,11 +54,11 @@
.PHONY: all
all: $(programs)
ser_filter: $(common_objects) ser_filter.o
- $(CXX) -o $@ $(CXXFLAGS) $(LIBPATH) $(LIBS) $^
+ $(CXX) -o $@ $(CXXFLAGS) $^ $(LIBPATH) $(LIBS)
.PHONY: clean
clean:
rm -f *.o *.d