Mercurial Mercurial > hg > stx-libview / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Fri, 17 Dec 1999 12:47:21 +0100
changeset 3119 4365df3a4247
parent 3118 5a03bfe77f91
child 3120 fe28515ab539
*** empty log message ***
WinWorkstation.st file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
nt.mak file | annotate | diff | comparison | revisions
ntw.mak file | annotate | diff | comparison | revisions
ntx.mak file | annotate | diff | comparison | revisions 
--- a/WinWorkstation.st	Wed Dec 15 17:49:53 1999 +0100
+++ b/WinWorkstation.st	Fri Dec 17 12:47:21 1999 +0100
@@ -75,6 +75,12 @@
 #define Date WIN_Date
 #undef Time
 #define Time WIN_Time
+#undef Delay
+#define Delay WIN_Delay
+#undef Signal
+#define Signal WIN_Signal
+#undef Set
+#define Set WIN_Set
 
 #include <stdio.h>
 /* #include <malloc.h> */
@@ -152,6 +158,18 @@
 # undef Time
 # define Time __DEF_Time
 #endif
+# ifdef __DEF_Set
+#  undef Set
+#  define Set __DEF_Set
+# endif
+# ifdef __DEF_Signal
+#  undef Signal
+#  define Signal __DEF_Signal
+# endif
+# ifdef __DEF_Delay
+#  undef Delay
+#  define Delay __DEF_Delay
+# endif
 #undef INT
 
 #define INT int
@@ -13738,6 +13756,6 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.173 1999-12-14 20:23:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.174 1999-12-17 11:47:17 cg Exp $'
 ! !
 WinWorkstation initialize!
--- a/bc.mak	Wed Dec 15 17:49:53 1999 +0100
+++ b/bc.mak	Fri Dec 17 12:47:21 1999 +0100
@@ -2,14 +2,14 @@
 # DO NOT EDIT 
 # automatically generated from Make.proto (by make nt.mak)
 #
-# $Header: /cvs/stx/stx/libview/bc.mak,v 1.36 1999-12-10 15:12:59 cg Exp $
+# $Header: /cvs/stx/stx/libview/bc.mak,v 1.37 1999-12-17 11:47:19 cg Exp $
 #
 TOP=..
 #
 !INCLUDE $(TOP)\rules\stdHeader_nt
 #
 LIBNAME=libview
-LIB_BASE=$(LIBVIEW_BASE)
+#LIB_BASE_LD_ARG=$(LIBVIEW_BASE_LD_ARG)
 STCOPT="+optinline -warnNonStandard"
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
 #STCLOCALOPT="-package=stx:libview +commonSymbols -varPrefix=libview"
--- a/nt.mak	Wed Dec 15 17:49:53 1999 +0100
+++ b/nt.mak	Fri Dec 17 12:47:21 1999 +0100
@@ -2,14 +2,14 @@
 # DO NOT EDIT 
 # automatically generated from Make.proto (by make nt.mak)
 #
-# $Header: /cvs/stx/stx/libview/Attic/nt.mak,v 1.36 1999-12-10 15:12:59 cg Exp $
+# $Header: /cvs/stx/stx/libview/Attic/nt.mak,v 1.37 1999-12-17 11:47:19 cg Exp $
 #
 TOP=..
 #
 !INCLUDE $(TOP)\rules\stdHeader_nt
 #
 LIBNAME=libview
-LIB_BASE=$(LIBVIEW_BASE)
+#LIB_BASE_LD_ARG=$(LIBVIEW_BASE_LD_ARG)
 STCOPT="+optinline -warnNonStandard"
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
 #STCLOCALOPT="-package=stx:libview +commonSymbols -varPrefix=libview"
--- a/ntw.mak	Wed Dec 15 17:49:53 1999 +0100
+++ b/ntw.mak	Fri Dec 17 12:47:21 1999 +0100
@@ -1,35 +1,26 @@
-#
-# $Header: /cvs/stx/stx/libview/Attic/ntw.mak,v 1.10 1999-09-11 13:22:41 cg Exp $
 #
-
-
+# $Header: /cvs/stx/stx/libview/Attic/ntw.mak,v 1.11 1999-12-17 11:47:20 cg Exp $
+#
 
 TOP=..
 
-
-
 !INCLUDE        $(TOP)\rules\stdHeader_nt
 
-
-
 LIBNAME=WinWorkstation
 PACKAGE=stx:libview
 RESFILES=$(OUTDIR)WinWorkstation.res
-LIB_BASE=$(WINWORKSTAT_BASE)
+#LIB_BASE_LD_ARG=$(WINWORKSTAT_BASE_LD_ARG)
 
 STCLOCALOPT= -staticMethods "-package=$(PACKAGE)" $(COMMONSYMBOLS) +optspace2 $(SEPINITCODE)
 
 STCFLAGS_WW=-H$(STX_INCDIR) -staticMethods "-package=(stx:libview)" $(COMMONSYMBOLS)
 
 
-
 ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll 
 
-
 OBJS= \
     $(OUTDIR)WinWorkstation.$(O)                      
 
-
 $(OUTDIR)WinWorkstation.$(O):   $(STX_INCDIR)\DeviceWorkstation.STH
 
 NOINCLINK=YES
@@ -48,8 +39,6 @@
 
 LIBINIT_FILE=
 
-
-
 !INCLUDE $(TOP)\rules\stdRules_nt
 
 
--- a/ntx.mak	Wed Dec 15 17:49:53 1999 +0100
+++ b/ntx.mak	Fri Dec 17 12:47:21 1999 +0100
@@ -1,32 +1,24 @@
 #
-
-# $Header: /cvs/stx/stx/libview/ntx.mak,v 1.10 1999-09-18 14:17:46 cg Exp $
-
+# $Header: /cvs/stx/stx/libview/ntx.mak,v 1.11 1999-12-17 11:47:21 cg Exp $
 #
 
-
-
 TOP=..
 
 !INCLUDE        $(TOP)\rules\stdHeader_nt
 
-
 LIBNAME=XWorkstation
 RESFILES=$(OUTDIR)XWorkstation.res
 PACKAGE=stx:libview
 
-LIB_BASE=$(XWORKSTAT_BASE)
-
+#LIB_BASE_LD_ARG=$(XWORKSTAT_BASE_LD_ARG)
 
 STCLOCALOPT= -staticMethods "-package=$(PACKAGE)" $(COMMONSYMBOLS) +optspace2 $(SEPINITCODE)
 
 STCFLAGS_WW=-H$(STX_INCDIR) -staticMethods "-package=(stx:libview)" $(COMMONSYMBOLS)
 
 
-
 ALL: xlibs $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll 
 
-
 OBJS= \
     $(OUTDIR)XWorkstation.$(O)                      
 
@@ -39,7 +31,7 @@
 
 DEF_FILE=XWorkstation_bc.def
 
-X11_LIBS=..\lib\X11OMF.lib ..\lib\XextOMF.lib
+X11_LIBS=..\libbc\X11OMF.lib ..\libbc\XextOMF.lib
 
 !else
 
@@ -55,31 +47,19 @@
 
 xlibs: $(X11_LIBS)
 
-
-..\lib\X11OMF.lib: ..\support\win32\borland\X11OMF.lib
-	copy ..\support\win32\borland\X11OMF.lib ..\lib
-
-
+..\libbc\X11OMF.lib: ..\support\win32\borland\X11OMF.lib
+	copy ..\support\win32\borland\X11OMF.lib ..\libbc
 
-..\lib\XextOMF.lib: ..\support\win32\borland\XextOMF.lib
-	copy ..\support\win32\borland\XextOMF.lib ..\lib
-
-
-
-
+..\libbc\XextOMF.lib: ..\support\win32\borland\XextOMF.lib
+	copy ..\support\win32\borland\XextOMF.lib ..\libbc
 
 ..\lib\X11.lib: ..\support\win32\msc\X11.lib
 	copy ..\support\win32\borland\X11.lib ..\lib
 
-
-
 ..\lib\Xext.lib: ..\support\win32\borland\Xext.lib
 	copy ..\support\win32\borland\Xext.lib ..\lib
 
 
-
-
-
 !INCLUDE $(TOP)\rules\stdRules_nt
hg/stx-libview