From 2d4248d14e8648f0e04bf29ca3fea0ff070c8bea Mon Sep 17 00:00:00 2001 From: elliott_c Date: Mon, 26 Jan 2004 19:02:58 +0000 Subject: ChangeLogTag: Mon Jan 26 13:01:42 2004 Chad Elliott --- ChangeLog | 21 ++++++++++++++------- bin/MakeProjectCreator/templates/make.mpd | 8 +++++--- bin/MakeProjectCreator/templates/makedll.mpt | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 421d922e173..b4aca67b9f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,22 @@ +Mon Jan 26 13:01:42 2004 Chad Elliott + + * bin/MakeProjectCreator/templates/make.mpd: + * bin/MakeProjectCreator/templates/makedll.mpt: + + Added support for cygwin32 and mingw32. + Mon Jan 26 18:10:13 UTC 2004 Johnny Willemsen - * include/makeinclude/build_lib.bor: - * include/makeinclude/compiler.bor: - Added support for the CBuilderX Preview ar. + * include/makeinclude/build_lib.bor: + * include/makeinclude/compiler.bor: + Added support for the CBuilderX Preview ar. Mon Jan 26 16:14:32 UTC 2004 Johnny Willemsen - * include/makeinclude/clean.bor: - Changed this file a little, special independent clean fules for cbx - and other versions and dependent on the version used the right clean - rule is used. + * include/makeinclude/clean.bor: + Changed this file a little, special independent clean fules for cbx + and other versions and dependent on the version used the right clean + rule is used. Mon Jan 26 16:02:13 UTC 2004 Johnny Willemsen diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd index 6c8ac69bf5b..65cfc97dac5 100644 --- a/bin/MakeProjectCreator/templates/make.mpd +++ b/bin/MakeProjectCreator/templates/make.mpd @@ -26,16 +26,18 @@ CCC = $(CXX) MAKEFILE = <%project_file%> DEPENDENCIES = .depend.$(MAKEFILE) <%if(exename)%> -BIN = <%exename%> +BIN = <%exename%>$(EXEEXT) <%endif%> <%if(staticname)%> LIB = lib<%staticname%>.a <%endif%> <%foreach(platforms)%> +EXEEXT = <%exeext%> <%if(soext)%> <%if(sharedname)%> SHLIB = lib<%sharedname%>.$(SOEXT) SOEXT = <%soext%> +LN = <%ln%> <%foreach(configurations)%> <%if(pic)%> PICFLAGS = <%pic%> @@ -179,7 +181,7 @@ install: echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)"; \ -test -d "<%install%>" || mkdir -p "<%install%>" 2> /dev/null || true; \ $(RM) "<%install%>/$(INSTARGET)"; \ - ln -s "$(PWD)/$(INSTARGET)" "<%install%>"; \ + $(LN) "$(PWD)/$(INSTARGET)" "<%install%>"; \ fi <%endif%> @@ -189,7 +191,7 @@ install: @if [ "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" != "." ]; then \ test -d "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" || mkdir -p "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" 2> /dev/null || true; \ $(RM) "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/$(INSTARGET)"; \ - ln -s "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>"; \ + $(LN) "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>"; \ fi <%endif%> diff --git a/bin/MakeProjectCreator/templates/makedll.mpt b/bin/MakeProjectCreator/templates/makedll.mpt index bde675710a0..597475bb95c 100644 --- a/bin/MakeProjectCreator/templates/makedll.mpt +++ b/bin/MakeProjectCreator/templates/makedll.mpt @@ -21,7 +21,9 @@ conditional_include "idl_compiler" conditional_include "common" configurations = gcc +ln = ln -s soext = so +exeext = cppflags = arflags = @@ -161,3 +163,18 @@ vxworks { prelink = __ctordtor.c ldlibs = -L$(WIND_BASE)/target/lib/$(CPUTYPE)/$(CPU)/common -larch } + +cygwin32 { + soext = dll + exeext = .exe + shflags = -shared + ln = mv +} + +mingw32 { + soext = dll + exeext = .exe + shflags = -shared + ln = mv + ldlibs = -lwsock32 -lnetapi32 +} -- cgit v1.2.1