From f658e02f8bb7d5307c4ee289534928503c2d8d2e Mon Sep 17 00:00:00 2001 From: James Uber Date: Sun, 7 Dec 2008 01:37:51 +0000 Subject: [PATCH] Makefile changed to build executable using all *.o instead of using DLL, because of changes in epanet.c at 2.00.12. epanet.c changed to comment out definition of DLL, allowing DLL, SOL, or CLE to be defined at compilation. git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@220 c320cabd-cc23-0410-96d8-e60fbf53ed7f --- build/Cyg/Makefile | 4 ++-- src/epanet.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Cyg/Makefile b/build/Cyg/Makefile index b2d00e4..989c1cc 100755 --- a/build/Cyg/Makefile +++ b/build/Cyg/Makefile @@ -123,9 +123,9 @@ $(dllname): $(epanet_objs) $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ epanet.o $^ -Wl,--kill-at $(dlltool) -d $(defname) --dllname $@ --output-lib $(implibname) --kill-at -$(exename): $(dllname) $(epanet_main_heads) +$(exename): $(epanet_objs) $(CC) $(CFLAGS) $(CPPFLAGS) -D CLE -c $(epanetsrcdir)/$(epanet_main).c - $(CC) $(CFLAGS) -o $@ $(epanet_main).o -l$(exename) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(epanet_main).o $^ $(LDFLAGS) $(epanet_objs): $(epanet_heads) diff --git a/src/epanet.c b/src/epanet.c index ef979ed..b38a5f6 100755 --- a/src/epanet.c +++ b/src/epanet.c @@ -110,7 +110,7 @@ execute function x and set the error code equal to its return value. /*** New compile directives ***/ //(2.00.11 - LR) //#define CLE /* Compile as a command line executable */ //#define SOL /* Compile as a shared object library */ -#define DLL /* Compile as a Windows DLL */ +//#define DLL /* Compile as a Windows DLL */ /*** Following lines are deprecated ***/ //(2.00.11 - LR) //#ifdef DLL