--- a/bc.mak Fri Jan 12 19:38:33 2007 +0100
+++ b/bc.mak Fri Jan 12 19:38:38 2007 +0100
@@ -13,24 +13,16 @@
# CFLAGS1= -WD -w-pro -w-ccc -w-rch -w-aus -w-par -x- -r- -k -y -v -vi- -c -tWDR
CFLAGS1= -w-pro -w-ccc -w-rch -w-aus -w-par -x- -r- -k -y -v -vi- -c
-CFLAGS_CONSOLE= -tWC -tWR -D_NO_VCL;WIN32
-CFLAGS_NOCONSOLE=-tWR -D_NO_VCL;WIN32GUI;WIN32 -DWIN_LOGFILE="\"stx_%%d.log\""
+CFLAGS_CONSOLE= -tWC -tWR -D_NO_VCL;WIN32 -DWIN_LOGFILE="\"stx_%d.log\""
+CFLAGS_NOCONSOLE=-tWR -D_NO_VCL;WIN32GUI;WIN32 -DWIN_LOGFILE="\"stx_%d.log\""
LFLAGS_CONSOLE=-ap
LFLAGS_NOCONSOLE=-aa
CRT_STARTUP_CONSOLE=c0x32.obj
CRT_STARTUP_NOCONSOLE=c0w32.obj
-!ifdef NOCONSOLE
-CFLAGS_APPTYPE= $(CFLAGS_NOCONSOLE)
-LFLAGS_APPTYPE=$(LFLAGS_NOCONSOLE)
-CRT_STARTUP=$(CRT_STARTUP_NOCONSOLE)
-ALLOBJFILES = winmain.obj
-!else
-CFLAGS_APPTYPE= $(CFLAGS_CONSOLE)
+CFLAGS_APPTYPE=$(CFLAGS_CONSOLE)
LFLAGS_APPTYPE=$(LFLAGS_CONSOLE)
CRT_STARTUP=$(CRT_STARTUP_CONSOLE)
-ALLOBJFILES = main.obj
-!endif
CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
-DSTARTUP_CLASS="\"Smalltalk\"" \
@@ -55,14 +47,11 @@
# LFLAGS = -L$(TOP)\libbc;$(BCB)\lib;$(DEBUGLIBPATH) -H:0x400000 -Hc:0x100000 -S:0x40000 -Sc:0x10000 -ap -Tpe -x -Gn -v -Ao:0x10000
LFLAGS = -L$(TOP)\libbc;$(BCB)\lib -S:0x40000 -Sc:0x10000 $(LFLAGS_APPTYPE) -Tpe -x -Gn -v -Ao:0x10000
-!ifndef PROJECT
PROJECT = stx.exe
-!endif
-
-
+ALLOBJFILES = main.obj
RESFILES = smalltalkWinRC.res
ALLOBJ = $(CRT_STARTUP) $(ALLOBJFILES) $(OBJS)
-DEFFILE=bc.def
+DEFFILE=$(TOP)\rules\bc_exe.def
LIBFILES=$(TOP)\libbc\librun.lib
ALLLIB=$(LIBFILES) import32.lib $(RT_LIB)
@@ -183,7 +172,7 @@
@echo DEFFILE= $(DEFFILE)
@echo ALLRES= $(ALLRES)
-$(PROJECT): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(REQUIRED_LIBS)
+$(PROJECT): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
$(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT),, $(ALLLIB), $(DEFFILE), $(RESFILES)
#$(PROJECT): $(ALLOBJFILES) $(RESFILES) $(DEFFILE)
@@ -206,11 +195,6 @@
main.obj: buildDate.h main.c bc.mak
-winmain.obj: buildDate.h main.c bc.mak
- $(CC) $(STX_INCL) $(SYS_INCL) $(FFLAGS) $(DEFS) \
- $(COPTFLAGS) $(DBGFLAGS) $(CFLAGS) -c -o$*.obj main.c
-
-
main.c: $(TOP)\librun\main.c
copy $(TOP)\librun\main.c main.c
@@ -234,7 +218,6 @@
$(MAKE) -N -f bc.mak -DNOCONSOLE PROJECT=winstx.exe winstx.exe
-
clean::
-del genDate.exe
-del c0x32.dll