summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorberkeviktor@aol.com <berkeviktor@aol.com>2010-08-26 16:40:45 +0200
committerberkeviktor@aol.com <berkeviktor@aol.com>2010-08-26 16:40:45 +0200
commit28fa51d48b986888e148c88cb979c3fbbe0d978a (patch)
tree9319ffdf619c4108166e49d7e7d69b65db721152
parent009cd28a31218d19e48e5b30224c6d1f58621072 (diff)
make fe-text build work (to some degree)
failsafe waitline2 need to be used though
-rw-r--r--src/fe-text/makefile.mak8
-rw-r--r--src/makefile.mak4
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