cvs: gd /libgd/netware Makefile keepscreen.c /libgd/netware/tests Makefile

guenter		Tue Aug 14 17:51:39 2007 UTC

  Modified files:              
    /gd/libgd/netware	Makefile keepscreen.c 
    /gd/libgd/netware/tests	Makefile 
  Log:
  updated NetWare build files (again).
  
http://cvs.php.net/viewvc.cgi/gd/libgd/netware/Makefile?r1=1.3&r2=1.4&diff_format=u
Index: gd/libgd/netware/Makefile
diff -u gd/libgd/netware/Makefile:1.3 gd/libgd/netware/Makefile:1.4
--- gd/libgd/netware/Makefile:1.3	Tue Aug 14 17:15:08 2007
+++ gd/libgd/netware/Makefile	Tue Aug 14 17:51:39 2007
@@ -136,16 +136,14 @@
 INCLUDES = -I. -I$(LIBGD) -I$(LIBPNG) -I$(LIBJPEG) -I$(LIBFT2)/include -I$(ZLIBSDK) 
 
 ifeq ($(LIBARCH),LIBC)
-	INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
-	# INCLUDES += -I$(SDK_LIBC)/include/winsock
-	# INCLUDES += -I$(SDK_LDAP)/libc/inc
+	INCLUDES += -I$(SDK_LIBC)/include
+	# INCLUDES += -I$(SDK_LIBC)/include/nks
 	CFLAGS += -D_POSIX_SOURCE
 	# CFLAGS += -D__ANSIC__
 else
-	INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
+	INCLUDES += -I$(SDK_CLIB)/include/nlm
+	# INCLUDES += -I$(SDK_CLIB)/include
 	# INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
-	# INCLUDES += -I$(SDK_LDAP)/clib/inc
-	CFLAGS += -DNETDB_USE_INTERNET
 endif
 CFLAGS	+= $(INCLUDES)
 
@@ -332,7 +330,7 @@
 
 OBJS	:= $(GDLIBOBJS) $(PNGLIBOBJS) $(JPGLIBOBJS) $(ZLIBOBJS)
 
-OBJL = $(OBJS) $(OBJDIR)/nwlibc.o
+OBJL	= $(OBJS) $(OBJDIR)/nwlibc.o
 
 vpath %.c . $(LIBGD) $(LIBPNG) $(LIBJPEG) $(ZLIBSDK)
 
@@ -426,6 +424,7 @@
 ifdef XDCDATA
 	@echo $(DL)xdcdata $(XDCDATA)$(DL) >> $@
 endif
+	@echo $(DL)flag_on 64$(DL) >> $@
 ifeq ($(LIBARCH),CLIB)
 	@echo $(DL)start _Prelude$(DL) >> $@
 	@echo $(DL)exit _Stop$(DL) >> $@
@@ -435,7 +434,6 @@
 	@echo $(DL)import @$(SDK_CLIB)/imports/socklib.imp$(DL) >> $@
 	@echo $(DL)module clib$(DL) >> $@
 else
-	@echo $(DL)flag_on 64$(DL) >> $@
 	@echo $(DL)pseudopreemption$(DL) >> $@
 	@echo $(DL)start _LibCPrelude$(DL) >> $@
 	@echo $(DL)exit _LibCPostlude$(DL) >> $@
http://cvs.php.net/viewvc.cgi/gd/libgd/netware/keepscreen.c?r1=1.2&r2=1.3&diff_format=u
Index: gd/libgd/netware/keepscreen.c
diff -u gd/libgd/netware/keepscreen.c:1.2 gd/libgd/netware/keepscreen.c:1.3
--- gd/libgd/netware/keepscreen.c:1.2	Sun Jun 24 12:57:18 2007
+++ gd/libgd/netware/keepscreen.c	Tue Aug 14 17:51:39 2007
@@ -1,25 +1,25 @@
-/* Simple _NonAppStop() implementation which can be linked to your 
- * NLM in order to keep the screen open when the NLM terminates
- * (the good old clib behaviour).
- * You dont have to call it, its done automatically from LibC.
- *
- * 2004-Aug-11  by Guenter Knauf 
- *
- * URL: http://www.gknw.com/development/mk_nlm/
- */
- 
-#include <stdio.h>
-#include <screen.h>
-
-void _NonAppStop()
-{
-    uint16_t row, col;
-    
-    GetScreenSize(&row, &col);
-    gotorowcol(row-1, 0);
-    /* pressanykey(); */
-    printf("<Press any key to close screen> ");
-    getcharacter();
-}
-
-
+/* Simple _NonAppStop() implementation which can be linked to your 
+ * NLM in order to keep the screen open when the NLM terminates
+ * (the good old clib behaviour).
+ * You dont have to call it, its done automatically from LibC.
+ *
+ * 2004-Aug-11  by Guenter Knauf 
+ *
+ * URL: http://www.gknw.com/development/mk_nlm/
+ */
+ 
+#include <stdio.h>
+#include <screen.h>
+
+void _NonAppStop()
+{
+    uint16_t row, col;
+    
+    GetScreenSize(&row, &col);
+    gotorowcol(row-1, 0);
+    /* pressanykey(); */
+    printf("<Press any key to close screen> ");
+    getcharacter();
+}
+
+
http://cvs.php.net/viewvc.cgi/gd/libgd/netware/tests/Makefile?r1=1.3&r2=1.4&diff_format=u
Index: gd/libgd/netware/tests/Makefile
diff -u gd/libgd/netware/tests/Makefile:1.3 gd/libgd/netware/tests/Makefile:1.4
--- gd/libgd/netware/tests/Makefile:1.3	Tue Aug 14 17:16:08 2007
+++ gd/libgd/netware/tests/Makefile	Tue Aug 14 17:51:39 2007
@@ -122,14 +122,14 @@
 SDK_LIBC = $(NDK_ROOT)/libc
 
 ifeq ($(LIBARCH),LIBC)
-	INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
-	# INCLUDES += -I$(SDK_LIBC)/include/winsock
+	INCLUDES += -I$(SDK_LIBC)/include
+	# INCLUDES += -I$(SDK_LIBC)/include/nks
 	CFLAGS += -D_POSIX_SOURCE
 	# CFLAGS += -D__ANSIC__
 else
-	INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
+	INCLUDES += -I$(SDK_CLIB)/include/nlm
+	# INCLUDES += -I$(SDK_CLIB)/include
 	# INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
-	CFLAGS += -DNETDB_USE_INTERNET
 endif
 CFLAGS	+= -I. -I.. -I$(LIBGD)
 CFLAGS	+= $(INCLUDES)
@@ -244,6 +244,7 @@
 ifeq ($(LDRING),3)
 	@echo $(DL)flag_on 512$(DL) >> $@
 endif
+	@echo $(DL)flag_on 64$(DL) >> $@
 ifeq ($(LIBARCH),CLIB)
 	@echo $(DL)start _Prelude$(DL) >> $@
 	@echo $(DL)exit _Stop$(DL) >> $@
@@ -252,7 +253,6 @@
 	@echo $(DL)import @$(SDK_CLIB)/imports/nlmlib.imp$(DL) >> $@
 	@echo $(DL)module clib$(DL) >> $@
 else
-	@echo $(DL)flag_on 64$(DL) >> $@
 	@echo $(DL)pseudopreemption$(DL) >> $@
 	@echo $(DL)start _LibCPrelude$(DL) >> $@
 	@echo $(DL)exit _LibCPostlude$(DL) >> $@