From 3d3f9d7e36b54ee4faa3d85c73a5d3e1b6198169 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 5 Aug 1999 15:34:16 +0000 Subject: [PATCH] dont build dllmain.cc on WIN32 if C++ compiler not specified --- src/libCom/Makefile.Host | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libCom/Makefile.Host b/src/libCom/Makefile.Host index af7c7f559..7e8fb48f6 100644 --- a/src/libCom/Makefile.Host +++ b/src/libCom/Makefile.Host @@ -77,6 +77,7 @@ LIBSRCS += aToIPAddr.c LIBSRCS += adjustment.c LIBSRCS += bsdSockResource.c LIBSRCS += osiSleep.c +LIBSRCS += bsdSockResCom.c # # if CPLUSPLUS isnt empty then include C++ src codes @@ -84,14 +85,15 @@ LIBSRCS += osiSleep.c # e.g. the C++ stuff, # please check Com.def! # -LIBSRCS += $(patsubst %,fdManager.cc,$(strip $(CPLUSPLUS))) -LIBSRCS += $(patsubst %,osiTimer.cc,$(strip $(CPLUSPLUS))) LIBSRCS += $(patsubst %,osiTime.cc,$(strip $(CPLUSPLUS))) LIBSRCS += $(patsubst %,osdTime.cc,$(strip $(CPLUSPLUS))) +LIBSRCS += $(patsubst %,osiTimer.cc,$(strip $(CPLUSPLUS))) +LIBSRCS += $(patsubst %,fdManager.cc,$(strip $(CPLUSPLUS))) # WIN32 has no getopt, we add it to the Com lib, # special initialisation is done in winmain.c -LIBSRCS_WIN32 := getopt.c dllmain.cc getLastWSAErrorAsString.c +LIBSRCS_WIN32 := getopt.c getLastWSAErrorAsString.c +LIBSRCS_WIN32 += $(patsubst %,dllmain.cc,$(strip $(CPLUSPLUS))) # Library to build: # lib$(LIBRARY).a or ..dll/..exp/..lib