From 28fa51d48b986888e148c88cb979c3fbbe0d978a Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Thu, 26 Aug 2010 16:40:45 +0200 Subject: [PATCH] make fe-text build work (to some degree) failsafe waitline2 need to be used though --- src/fe-text/makefile.mak | 8 +++++++- src/makefile.mak | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/fe-text/makefile.mak b/src/fe-text/makefile.mak index abca9985..299e96a5 100644 --- a/src/fe-text/makefile.mak +++ b/src/fe-text/makefile.mak @@ -3,8 +3,14 @@ include "..\makeinc.mak" COMLIB = ..\common\xchatcommon.lib PROG = xchat-text.exe +!ifdef X64 +PLATOBJ = msvcrt_win2003.obj +!else +PLATOBJ = msvcrt_winxp.obj +!endif + all: fe-text.obj - link /out:$(PROG) /entry:mainCRTStartup $(LDFLAGS) $(LIBS) $(COMLIB) fe-text.obj + link /out:$(PROG) /subsystem:console /nologo $(PLATOBJ) $(LIBS) $(COMLIB) fe-text.obj fe-text.obj: fe-text.c makefile.mak cl $(CFLAGS) $(GLIB) fe-text.c diff --git a/src/makefile.mak b/src/makefile.mak index 700ba6e6..ff286edb 100644 --- a/src/makefile.mak +++ b/src/makefile.mak @@ -3,8 +3,8 @@ all: @-$(MAKE) /nologo /s /f makefile.mak $@ @cd ..\fe-gtk @-$(MAKE) /nologo /s /f makefile.mak $@ -# @cd ..\fe-text -# @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\fe-text + @-$(MAKE) /nologo /s /f makefile.mak $@ clean: @del common\*.obj