Mercurial > flash_v2

changeset 932:d142fcd415a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author jld
date Fri, 11 Apr 2003 12:12:26 +0000
parents d7c9117adc25
children a2140be948f2
files host/tools/ecostest/ChangeLog host/tools/ecostest/common/eCosTestPlatform.cpp host/tools/ecostest/unix/Makefile
diffstat 3 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/host/tools/ecostest/ChangeLog
+++ b/host/tools/ecostest/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-11  John Dallaway  <jld@ecoscentric.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@ecoscentric.com>
 
 	* common/eCosTestPlatform.cpp (CeCosTestPlatform::Load): Allow an
--- a/host/tools/ecostest/common/eCosTestPlatform.cpp
+++ b/host/tools/ecostest/common/eCosTestPlatform.cpp
@@ -188,7 +188,7 @@ bool CeCosTestPlatform::Load()
   const String strDir(CeCosTestUtils::HomeFile(_T(".eCosPlatforms")));
 #ifdef _WIN32
   if(!CeCosTestUtils::Exists(strDir)){
-    return rc;
+    return true;
   }
 #endif
   LoadFromDir(strDir);
--- a/host/tools/ecostest/unix/Makefile
+++ b/host/tools/ecostest/unix/Makefile
@@ -25,12 +25,16 @@ 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
@@ -52,7 +56,7 @@ CXXFLAGS=-g -O2 -Wall -D_REENTRANT -D_DE
 all: $(programs)
 
 ser_filter: $(common_objects) ser_filter.o
-	$(CXX) -o $@  $(CXXFLAGS) $(LIBPATH) $(LIBS) $^
+	$(CXX) -o $@  $(CXXFLAGS) $^ $(LIBPATH) $(LIBS)
 
 
 .PHONY: clean