--- a/bc.mak Mon Dec 01 20:11:06 2008 +0100
+++ b/bc.mak Mon Dec 01 20:11:08 2008 +0100
@@ -1,13 +1,13 @@
# $Header$
#
-# DO NOT EDIT
+# DO NOT EDIT
# automagically generated from the projectDefinition: stx_projects_smalltalk.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
#
-TOP=..\..
+TOP=..\..
INCLUDE_TOP=$(TOP)\..
# CFLAGS1= -WD -w-pro -w-ccc -w-rch -w-aus -w-par -x- -r- -k -y -v -vi- -c -tWDR
@@ -38,11 +38,16 @@
OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
+
#
LIBNAME=dummy
STCOPT="+optinline"
LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
-STCLOCALOPT='-package=$(PACKAGE)' $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
+LOCALDEFINES=
+GLOBALDEFINES=
+
+STCLOCALOPT='-package=$(PACKAGE)' $(LOCALDEFINES) $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
LINKER = ilink32
@@ -84,18 +89,17 @@
REQUIRED_SUPPORT_DIRS=RESOURCEFILES
-target: exe
+target: exe
# the executable, all required files and a self-installing-installer-exe
ALL:: exe setup
-exe: stx winstx
+exe: newBuildDate stx winstx
# the executable only
# with console
stx:
-del main.obj
- -del buildDate.h
$(MAKE) -N -f bc.mak \
PROJECT=$(PROJECT_CONSOLE) \
CFLAGS_APPTYPE="$(CFLAGS_CONSOLE)" \
@@ -105,7 +109,6 @@
# without console
winstx:
-del main.obj
- -del buildDate.h
$(MAKE) -N -f bc.mak \
PROJECT=$(PROJECT_NOCONSOLE) \
CFLAGS_APPTYPE="$(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"winstx.log\\"\""" \
@@ -113,30 +116,96 @@
CRT_STARTUP="$(CRT_STARTUP_NOCONSOLE)" theExe
# the executable only (internal target; needs some defines)
-theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
+theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
+
+# build all prerequisite packages for this package
+prereq:
+ pushd ..\..\libbasic
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libbasic2
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libcomp
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\goodies\refactoryBrowser\helpers
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\parser
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\..\..\libboss
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libbasic3
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libview
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\goodies\refactoryBrowser\changes
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\..\..\libview2
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libui
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libwidg
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libhtml
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libwidg2
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libwidg3
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libtool
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\libtool2
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\goodies\refactoryBrowser\refactoring
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ pushd ..\..\..\librun
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ popd
+ cd ..\projects\smalltalk
+
# a nullsoft installable delivery
setup: $(REQUIRED_SUPPORT_DIRS) install_smalltalk.exe
+newBuildDate:
+ del buildDate.h
+
# This uses the Nullsoft Installer Package and works in Windows only
install_smalltalk.exe: $(PROJECT) smalltalk.nsi
- $(MAKENSIS) smalltalk.nsi
+ $(MAKENSIS) smalltalk.nsi
new:
- bmake clean
- bmake
+ bmake clean
+ bmake
RESOURCEFILES: smalltalk_RESOURCES smalltalk_BITMAPS \
- stx_RESOURCES stx_STYLES stx_BITMAPS
+ stx_RESOURCES stx_STYLES stx_BITMAPS
smalltalk_RESOURCES: resources\stx\projects\smalltalk\NUL
- -copy ..\resources\*.rs resources\stx\projects\smalltalk\..\*.*
+ -copy ..\resources\*.rs resources\stx\projects\smalltalk\..
+ -copy ..\resources\*.style resources\stx\projects\smalltalk\..
smalltalk_BITMAPS: resources\stx\projects\smalltalk\bitmaps\NUL
- -copy *.ico resources\stx\projects\smalltalk\bitmaps\*.*
- -copy *.gif resources\stx\projects\smalltalk\bitmaps\*.*
+ -copy *.ico resources\stx\projects\smalltalk\bitmaps
+ -copy *.gif resources\stx\projects\smalltalk\bitmaps
resources\stx\projects\smalltalk\bitmaps\NUL: resources\stx\projects\smalltalk\NUL
mkdir resources\stx\projects\smalltalk\bitmaps
@@ -151,6 +220,8 @@
stx_RESOURCES: \
keyboard.rc \
+ display.rc \
+ d_win32.rc \
libbasic_RESOURCES \
libview_RESOURCES \
libtool_RESOURCES \
@@ -159,6 +230,12 @@
keyboard.rc: $(TOP)\projects\smalltalk\keyboard.rc
copy $(TOP)\projects\smalltalk\keyboard.rc *.*
+display.rc: $(TOP)\projects\smalltalk\display.rc
+ copy $(TOP)\projects\smalltalk\display.rc *.*
+
+d_win32.rc: $(TOP)\projects\smalltalk\d_win32.rc
+ copy $(TOP)\projects\smalltalk\d_win32.rc *.*
+
stx_STYLES: resources\stx\libview\NUL
copy $(TOP)\libview\styles\mswindowsXP* resources\stx\libview\*.*
copy $(TOP)\libview\styles\mswindows*.common resources\stx\libview\*.*
@@ -219,166 +296,172 @@
+
+
+
libstx_libbasic.dll: ..\..\libbasic\objbc\libstx_libbasic.dll
copy ..\..\libbasic\objbc\libstx_libbasic.dll *.*
..\..\libbasic\objbc\libstx_libbasic.dll:
cd ..\..\libbasic
- bmake
- cd ..\..\..\stx\projects\smalltalk
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
libstx_libbasic2.dll: ..\..\libbasic2\objbc\libstx_libbasic2.dll
copy ..\..\libbasic2\objbc\libstx_libbasic2.dll *.*
..\..\libbasic2\objbc\libstx_libbasic2.dll:
cd ..\..\libbasic2
- bmake
- cd ..\..\..\stx\projects\smalltalk
-
-libstx_libbasic3.dll: ..\..\libbasic3\objbc\libstx_libbasic3.dll
- copy ..\..\libbasic3\objbc\libstx_libbasic3.dll *.*
-
-..\..\libbasic3\objbc\libstx_libbasic3.dll:
- cd ..\..\libbasic3
- bmake
- cd ..\..\..\stx\projects\smalltalk
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
libstx_libcomp.dll: ..\..\libcomp\objbc\libstx_libcomp.dll
copy ..\..\libcomp\objbc\libstx_libcomp.dll *.*
..\..\libcomp\objbc\libstx_libcomp.dll:
cd ..\..\libcomp
- bmake
- cd ..\..\..\stx\projects\smalltalk
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
-libstx_libhtml.dll: ..\..\libhtml\objbc\libstx_libhtml.dll
- copy ..\..\libhtml\objbc\libstx_libhtml.dll *.*
+libstx_goodies_refactoryBrowser_helpers.dll: ..\..\goodies\refactoryBrowser\helpers\objbc\libstx_goodies_refactoryBrowser_helpers.dll
+ copy ..\..\goodies\refactoryBrowser\helpers\objbc\libstx_goodies_refactoryBrowser_helpers.dll *.*
-..\..\libhtml\objbc\libstx_libhtml.dll:
- cd ..\..\libhtml
- bmake
- cd ..\..\..\stx\projects\smalltalk
+..\..\goodies\refactoryBrowser\helpers\objbc\libstx_goodies_refactoryBrowser_helpers.dll:
+ cd ..\..\goodies\refactoryBrowser\helpers
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\..\..\projects\smalltalk
-libstx_libtool.dll: ..\..\libtool\objbc\libstx_libtool.dll
- copy ..\..\libtool\objbc\libstx_libtool.dll *.*
+libstx_goodies_refactoryBrowser_parser.dll: ..\..\goodies\refactoryBrowser\parser\objbc\libstx_goodies_refactoryBrowser_parser.dll
+ copy ..\..\goodies\refactoryBrowser\parser\objbc\libstx_goodies_refactoryBrowser_parser.dll *.*
-..\..\libtool\objbc\libstx_libtool.dll:
- cd ..\..\libtool
- bmake
- cd ..\..\..\stx\projects\smalltalk
+..\..\goodies\refactoryBrowser\parser\objbc\libstx_goodies_refactoryBrowser_parser.dll:
+ cd ..\..\goodies\refactoryBrowser\parser
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\..\..\projects\smalltalk
-libstx_libtool2.dll: ..\..\libtool2\objbc\libstx_libtool2.dll
- copy ..\..\libtool2\objbc\libstx_libtool2.dll *.*
+libstx_libboss.dll: ..\..\libboss\objbc\libstx_libboss.dll
+ copy ..\..\libboss\objbc\libstx_libboss.dll *.*
-..\..\libtool2\objbc\libstx_libtool2.dll:
- cd ..\..\libtool2
- bmake
- cd ..\..\..\stx\projects\smalltalk
+..\..\libboss\objbc\libstx_libboss.dll:
+ cd ..\..\libboss
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
-libstx_libui.dll: ..\..\libui\objbc\libstx_libui.dll
- copy ..\..\libui\objbc\libstx_libui.dll *.*
+libstx_libbasic3.dll: ..\..\libbasic3\objbc\libstx_libbasic3.dll
+ copy ..\..\libbasic3\objbc\libstx_libbasic3.dll *.*
-..\..\libui\objbc\libstx_libui.dll:
- cd ..\..\libui
- bmake
- cd ..\..\..\stx\projects\smalltalk
+..\..\libbasic3\objbc\libstx_libbasic3.dll:
+ cd ..\..\libbasic3
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
libstx_libview.dll: ..\..\libview\objbc\libstx_libview.dll
copy ..\..\libview\objbc\libstx_libview.dll *.*
..\..\libview\objbc\libstx_libview.dll:
cd ..\..\libview
- bmake
- cd ..\..\..\stx\projects\smalltalk
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
+
+libstx_goodies_refactoryBrowser_changes.dll: ..\..\goodies\refactoryBrowser\changes\objbc\libstx_goodies_refactoryBrowser_changes.dll
+ copy ..\..\goodies\refactoryBrowser\changes\objbc\libstx_goodies_refactoryBrowser_changes.dll *.*
+
+..\..\goodies\refactoryBrowser\changes\objbc\libstx_goodies_refactoryBrowser_changes.dll:
+ cd ..\..\goodies\refactoryBrowser\changes
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\..\..\projects\smalltalk
libstx_libview2.dll: ..\..\libview2\objbc\libstx_libview2.dll
copy ..\..\libview2\objbc\libstx_libview2.dll *.*
..\..\libview2\objbc\libstx_libview2.dll:
cd ..\..\libview2
- bmake
- cd ..\..\..\stx\projects\smalltalk
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
+
+libstx_libui.dll: ..\..\libui\objbc\libstx_libui.dll
+ copy ..\..\libui\objbc\libstx_libui.dll *.*
+
+..\..\libui\objbc\libstx_libui.dll:
+ cd ..\..\libui
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
libstx_libwidg.dll: ..\..\libwidg\objbc\libstx_libwidg.dll
copy ..\..\libwidg\objbc\libstx_libwidg.dll *.*
..\..\libwidg\objbc\libstx_libwidg.dll:
cd ..\..\libwidg
- bmake
- cd ..\..\..\stx\projects\smalltalk
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
+
+libstx_libhtml.dll: ..\..\libhtml\objbc\libstx_libhtml.dll
+ copy ..\..\libhtml\objbc\libstx_libhtml.dll *.*
+
+..\..\libhtml\objbc\libstx_libhtml.dll:
+ cd ..\..\libhtml
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
libstx_libwidg2.dll: ..\..\libwidg2\objbc\libstx_libwidg2.dll
copy ..\..\libwidg2\objbc\libstx_libwidg2.dll *.*
..\..\libwidg2\objbc\libstx_libwidg2.dll:
cd ..\..\libwidg2
- bmake
- cd ..\..\..\stx\projects\smalltalk
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
libstx_libwidg3.dll: ..\..\libwidg3\objbc\libstx_libwidg3.dll
copy ..\..\libwidg3\objbc\libstx_libwidg3.dll *.*
..\..\libwidg3\objbc\libstx_libwidg3.dll:
cd ..\..\libwidg3
- bmake
- cd ..\..\..\stx\projects\smalltalk
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
-libstx_goodies_refactoryBrowser_helpers.dll: ..\..\goodies\refactoryBrowser\helpers\objbc\libstx_goodies_refactoryBrowser_helpers.dll
- copy ..\..\goodies\refactoryBrowser\helpers\objbc\libstx_goodies_refactoryBrowser_helpers.dll *.*
+libstx_libtool.dll: ..\..\libtool\objbc\libstx_libtool.dll
+ copy ..\..\libtool\objbc\libstx_libtool.dll *.*
-..\..\goodies\refactoryBrowser\helpers\objbc\libstx_goodies_refactoryBrowser_helpers.dll:
- cd ..\..\goodies\refactoryBrowser\helpers
- bmake
- cd ..\..\..\..\..\stx\projects\smalltalk
+..\..\libtool\objbc\libstx_libtool.dll:
+ cd ..\..\libtool
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
-libstx_goodies_refactoryBrowser_parser.dll: ..\..\goodies\refactoryBrowser\parser\objbc\libstx_goodies_refactoryBrowser_parser.dll
- copy ..\..\goodies\refactoryBrowser\parser\objbc\libstx_goodies_refactoryBrowser_parser.dll *.*
+libstx_libtool2.dll: ..\..\libtool2\objbc\libstx_libtool2.dll
+ copy ..\..\libtool2\objbc\libstx_libtool2.dll *.*
-..\..\goodies\refactoryBrowser\parser\objbc\libstx_goodies_refactoryBrowser_parser.dll:
- cd ..\..\goodies\refactoryBrowser\parser
- bmake
- cd ..\..\..\..\..\stx\projects\smalltalk
+..\..\libtool2\objbc\libstx_libtool2.dll:
+ cd ..\..\libtool2
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\projects\smalltalk
libstx_goodies_refactoryBrowser_refactoring.dll: ..\..\goodies\refactoryBrowser\refactoring\objbc\libstx_goodies_refactoryBrowser_refactoring.dll
copy ..\..\goodies\refactoryBrowser\refactoring\objbc\libstx_goodies_refactoryBrowser_refactoring.dll *.*
..\..\goodies\refactoryBrowser\refactoring\objbc\libstx_goodies_refactoryBrowser_refactoring.dll:
cd ..\..\goodies\refactoryBrowser\refactoring
- bmake
- cd ..\..\..\..\..\stx\projects\smalltalk
-
-libstx_goodies_refactoryBrowser_changes.dll: ..\..\goodies\refactoryBrowser\changes\objbc\libstx_goodies_refactoryBrowser_changes.dll
- copy ..\..\goodies\refactoryBrowser\changes\objbc\libstx_goodies_refactoryBrowser_changes.dll *.*
+ bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd ..\..\..\projects\smalltalk
-..\..\goodies\refactoryBrowser\changes\objbc\libstx_goodies_refactoryBrowser_changes.dll:
- cd ..\..\goodies\refactoryBrowser\changes
- bmake
- cd ..\..\..\..\..\stx\projects\smalltalk
-
-libstx_libboss.dll: ..\..\libboss\objbc\libstx_libboss.dll
- copy ..\..\libboss\objbc\libstx_libboss.dll *.*
-
-..\..\libboss\objbc\libstx_libboss.dll:
- cd ..\..\libboss
- bmake
- cd ..\..\..\stx\projects\smalltalk
+
-
+sources\NUL:
+ mkdir sources
show:
- @echo LFLAGS= $(LFLAGS)
- @echo ALLOBJ= $(ALLOBJ)
- @echo PROJECT= $(PROJECT)
- @echo ALLLIB= $(ALLLIB)
- @echo DEFFILE= $(DEFFILE)
- @echo ALLRES= $(ALLRES)
+ @echo LFLAGS= $(LFLAGS)
+ @echo ALLOBJ= $(ALLOBJ)
+ @echo PROJECT= $(PROJECT)
+ @echo ALLLIB= $(ALLLIB)
+ @echo DEFFILE= $(DEFFILE)
+ @echo ALLRES= $(ALLRES)
$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
- $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT_CONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
+ $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT_CONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
- $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT_NOCONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
+ $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT_NOCONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
#$(PROJECT): $(ALLOBJFILES) $(RESFILES) $(DEFFILE)
# $(BCB)\BIN\$(LINKER) @&&!