--- a/Make.proto Tue Aug 08 11:31:54 2006 +0200
+++ b/Make.proto Tue Aug 08 11:35:31 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.proto,v 1.136 2004-09-20 09:41:23 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.proto,v 1.137 2006-08-08 09:35:30 cg Exp $
#
# -------------- no need to change anything below ----------
@@ -17,6 +17,7 @@
STCOPT=$(LIBVIEW_STCOPT)
ZFLAG=-varPrefix=$(LIBNAME)
STCLOCALOPT='-package=$(PACKAGE)' $(COMMONSYMBOLS) $(SEPINITCODE) $(ZFLAG)
+# STCLOCALOPT='-package=$(PACKAGE)' $(SEPINITCODE) $(ZFLAG)
LINKOBJRULE=$(SEPINITLINKOBJRULE)
LOCALDEFS=-I$(XINCLUDE) $(XDEFS) $(CC_3D_FLAGS)
@@ -176,7 +177,15 @@
XWorkstation.$(O): XWorkstation.st $(INCLUDE)/DeviceWorkstation.H $(INCLUDE)/HostGraphicsDevice.H $(INCLUDE)/GraphicsDevice.H
$(MAKE) $(BIG_STFILE_RULE) BIG_FILE=XWorkstation \
CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)" \
+ CLASSLIB_CC="$(CLASSLIB_CC)" \
+ CLASSLIB_OPT="$(CLASSLIB_OPT) -primitiveStackSize=64000" \
+ SEPINITCODE=-sepInitCode ZFLAG=
+
+xw:
+ $(MAKE) XWorkstation.c \
+ CC="$(CC)" OPT="$(OPT)" \
+ CLASSLIB_CC="$(CLASSLIB_CC)" \
+ CLASSLIB_OPT="$(CLASSLIB_OPT) -primitiveStackSize: 64000 -V" \
SEPINITCODE=-sepInitCode ZFLAG=
__GLXWorkstation.$(O): GLXWorkstation.st $(INCLUDE)/XWorkstation.H $(INCLUDE)/DeviceWorkstation.H $(INCLUDE)/HostGraphicsDevice.H $(INCLUDE)/GraphicsDevice.H $(INCLUDE)/stc.h
--- a/Make.spec Tue Aug 08 11:31:54 2006 +0200
+++ b/Make.spec Tue Aug 08 11:35:31 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.spec,v 1.4 2006-08-08 09:25:41 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.spec,v 1.5 2006-08-08 09:35:31 cg Exp $
#
MODULE=stx
@@ -11,6 +11,9 @@
# although WinWorkstation is a WIN32-Obj, its not included
# in libview.dll
#
+# However, XWorkstation is used in both versions.
+
+
WIN32_OBJS=$(OUTDIR)WinPrinter.$(O)
NOTINLIBOBJS= \
@@ -81,8 +84,12 @@
$(OUTDIR)Depth32Image.$(O) \
$(OUTDIR)ImageMask.$(O)
-OBJS = \
+COMMON_OBJS = \
$(LIBOBJS) \
$(MOREOBJS) \
$(OPENGLOBJS) \
$(NOTINLIBOBJS)
+
+
+
+OBJS=$(COMMON_OBJS)
--- a/bc.mak Tue Aug 08 11:31:54 2006 +0200
+++ b/bc.mak Tue Aug 08 11:35:31 2006 +0200
@@ -2,7 +2,7 @@
# DO NOT EDIT
# automatically generated from Make.proto (by make nt.mak)
#
-# $Header: /cvs/stx/stx/libview/bc.mak,v 1.45 2006-08-08 09:31:54 cg Exp $
+# $Header: /cvs/stx/stx/libview/bc.mak,v 1.46 2006-08-08 09:35:31 cg Exp $
#
TOP=..
#
@@ -20,6 +20,8 @@
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
xxOBJS=\
$(OUTDIR)GraphicsDevice.$(O) \
$(OUTDIR)HostGraphicsDevice.$(O) \
--- a/nt.mak Tue Aug 08 11:31:54 2006 +0200
+++ b/nt.mak Tue Aug 08 11:35:31 2006 +0200
@@ -2,7 +2,7 @@
# DO NOT EDIT
# automatically generated from Make.proto (by make nt.mak)
#
-# $Header: /cvs/stx/stx/libview/Attic/nt.mak,v 1.45 2006-08-08 09:31:54 cg Exp $
+# $Header: /cvs/stx/stx/libview/Attic/nt.mak,v 1.46 2006-08-08 09:35:31 cg Exp $
#
TOP=..
#
@@ -20,6 +20,8 @@
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
xxOBJS=\
$(OUTDIR)GraphicsDevice.$(O) \
$(OUTDIR)HostGraphicsDevice.$(O) \