diff options
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/info/Makefile | 8 | ||||
| -rw-r--r-- | cpp/test/IceSSL/configuration/Makefile | 8 | ||||
| -rw-r--r-- | cpp/test/IceUtil/unicode/Client.cpp | 16 | ||||
| -rw-r--r-- | cpp/test/Makefile | 18 |
4 files changed, 35 insertions, 15 deletions
diff --git a/cpp/test/Ice/info/Makefile b/cpp/test/Ice/info/Makefile index fabbe5521b0..5df66daac71 100644 --- a/cpp/test/Ice/info/Makefile +++ b/cpp/test/Ice/info/Makefile @@ -31,14 +31,18 @@ SLICE_SRCS = Test.ice include $(top_srcdir)/config/Make.rules +ifneq ($(MinGW), yes) + ICESSL_LIBNAME = IceSSL +endif + CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(OPENSSL_RPATH_LINK) -lIceSSL $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(OPENSSL_RPATH_LINK) -l$(ICESSL_LIBNAME) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) -l$(ICESSL_LIBNAME) include .depend diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile index e8b3203729c..776f8219eea 100644 --- a/cpp/test/IceSSL/configuration/Makefile +++ b/cpp/test/IceSSL/configuration/Makefile @@ -31,14 +31,18 @@ GENPIC = no include $(top_srcdir)/config/Make.rules +ifneq ($(MinGW), yes) +ICESSL_LIBNAME = IceSSL +endif + CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) $(OPENSSL_RPATH_LINK) -lIceSSL + $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) $(OPENSSL_RPATH_LINK) -l$(ICESSL_LIBNAME) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) $(OPENSSL_RPATH_LINK) -lIceSSL + $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) $(OPENSSL_RPATH_LINK) -l$(ICESSL_LIBNAME) include .depend diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp index 3f703e0f7f2..f05cb7646b7 100644 --- a/cpp/test/IceUtil/unicode/Client.cpp +++ b/cpp/test/IceUtil/unicode/Client.cpp @@ -23,7 +23,8 @@ using namespace std; // converts these BOMs back and forth. // -#ifdef _WIN32 +//COMPILERFIX: MINGW doesn't support wmain for console applications. +#if defined(_WIN32) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) @@ -40,7 +41,12 @@ main(int argc, char* argv[]) if(argc > 1) { #ifdef _WIN32 + +# ifdef __MINGW32__ + dir = argv[1]; +# else dir = IceUtil::wstringToString(argv[1]); +# endif dir += "\\"; #else dir = argv[1]; @@ -174,6 +180,7 @@ main(int argc, char* argv[]) cout << "ok" << endl; } +#ifndef __MINGW32__ { cout << "testing UTF-8 filename... "; IceUtilInternal::ifstream fn(dir + "filename.txt"); @@ -200,11 +207,11 @@ main(int argc, char* argv[]) int fd = IceUtilInternal::open(filepath, O_RDONLY); test(fd > 0); -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +# if defined(_MSC_VER) && (_MSC_VER >= 1400) test(_close(fd) == 0); -#else +# else test(close(fd) == 0); -#endif +# endif FILE* f = IceUtilInternal::fopen(filepath, "r"); test(f != 0); @@ -245,5 +252,6 @@ main(int argc, char* argv[]) cout << "ok" << endl; } +#endif return EXIT_SUCCESS; } diff --git a/cpp/test/Makefile b/cpp/test/Makefile index 4dbb8f55c7e..a56cf17c9f0 100644 --- a/cpp/test/Makefile +++ b/cpp/test/Makefile @@ -14,13 +14,17 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = IceUtil \ Slice \ Ice \ - IceSSL \ - IceBox \ - IceStorm \ - Freeze \ - FreezeScript \ - Glacier2 \ - IceGrid + IceSSL + +ifneq ($(MinGW), yes) +SUBDIRS := $(SUBDIRS) \ + IceBox \ + IceStorm \ + Freeze \ + FreezeScript \ + Glacier2 \ + IceGrid +endif $(EVERYTHING):: @for subdir in $(SUBDIRS); \ |