cflib: create directories for make install

CONFIGVARS

@@ -2,7 +2,7 @@
 # 
 # cross compiling
 #CROSS = yes
-CROSS = no
+#CROSS = no
 
 #
 # build alternate libraries for processor variants
@@ -13,15 +13,29 @@ WITH_V4E_LIB = yes
 #
 # target and host compiler
 # 
+# Define this to "m68k-atari-mint" if you cross compile.
+ifneq ($(CROSS_TOOL),)
+ CROSSPREFIX=$(CROSS_TOOL)-
+ CROSS := yes
+else
 ifeq ($(CROSS),yes)
+ CROSS_TOOL=m68k-atari-mint
+ CROSSPREFIX=$(CROSS_TOOL)-
+else
+ CROSSPREFIX=
+endif
+endif
 
-CROSSPREFIX=m68k-atari-mint-
+ifeq ($(CROSS),yes)
 
 NATIVECC = gcc
 NATIVECFLAGS = -O
 CRLF = echo crlf -s
 
-PREFIX=/usr/m68k-atari-mint
+PREFIX=$(shell $(CROSSPREFIX)gcc -print-sysroot)/usr
+ifeq ($(PREFIX),)
+  PREFIX=/usr/$(CROSS_TOOL)
+endif
 
 else
 

RULES

@@ -7,7 +7,7 @@ include $(srcdir)/MISCFILES
 
 all: all-here all-recursive
 
-clean: clean-recursive
+clean:: clean-recursive
 	rm -f *.o lib*.a *.tmp
 	rm -f core report nohup.out errlog
 	rm -f foobar foo bar baz junk schrott muell

cflib/Makefile

@@ -69,16 +69,22 @@ docu: cflib.stg
 	$(HCP) -ocflib.hyp cflib.stg
 
 install:
+	install -m 755 -d $(PREFIX)/include
 	install -m 644 cflib.h        ${PREFIX}/include
+	install -m 755 -d $(PREFIX)/lib
 	install -m 644 libcflib.a     ${PREFIX}/lib
+	install -m 755 -d $(PREFIX)/lib/mshort
 	install -m 644 libcflib16.a   ${PREFIX}/lib/mshort/libcflib.a
 	ln -sf mshort/libcflib.a	      ${PREFIX}/lib/libcflib16.a
 ifeq ($(WITH_020_LIB),yes)
+	install -m 755 -d $(PREFIX)/lib/m68020-60
 	install -m 644 libcflib020.a  ${PREFIX}/lib/m68020-60/libcflib.a
 endif
 ifeq ($(WITH_V4E_LIB),yes)
+	install -m 755 -d $(PREFIX)/lib/m5475
 	install -m 644 libcflibv4e.a  ${PREFIX}/lib/m5475/libcflib.a
 endif
+	install -m 755 -d $(PREFIX)/lib/stguide
 	install -m 644 cflib.hyp      ${PREFIX}/stguide
 	install -m 644 cflib.ref      ${PREFIX}/stguide
 

cflib/SRCFILES

@@ -6,7 +6,6 @@ HEADER = \
 	dragdrop.h \
 	file.h \
 	inline.h \
-	inline.rh \
 	inline.rsh \
 	intern.h \
 	magx.h \

cflib/ascii_table.c

@@ -49,7 +49,7 @@ _redraw_obj (OBJECT * tree, short obj)
 static void
 set_numbers (short code)
 {
-	char str[6];
+	char str[16];
 
 	sprintf (str, "%03d", code);
 	set_string (cf_ascii_tab, AT_DEZ, str);

cflib/cflib.h

@@ -480,6 +480,7 @@ void	scrap_wtxt	(char *buf);
 void	fix_dial	(OBJECT *tree);
 void	fix_menu	(OBJECT *tree);
 void	fix_popup	(OBJECT *tree, short thin_line);
+void cf_use_all_userdefs (short all);
 
 /*******************************************************************************
  * vdi functions

cflib/demo/demo.c

@@ -37,7 +37,7 @@
 OBJECT	*menu, *objdial, *popdial, *wicon, *popups, *about;
 WDIALOG	*wdial;
 short	quit;
-short	msg[8], vdi_handle;
+short	vdi_handle;
 short	event, msx, msy, mbutton, kstate, mclick, kreturn, win_handle;
 short	modal = FALSE;
 short	id = 1, pts = 10;
@@ -165,7 +165,7 @@ appmodal_dial (void)
 {
 	void *mdial;
 	short close = FALSE;
-	short id, exit_obj;
+	short stguide_id, exit_obj;
 
 	mdial = open_mdial (objdial, EDIT1);
 	while (!close)
@@ -185,9 +185,9 @@ appmodal_dial (void)
 				break;
 
 			case HELP:
-				id = appl_find ("ST-GUIDE");
-				if (id > 0)
-					send_vastart (id, "*:\\cflib.hyp");
+				stguide_id = appl_find ("ST-GUIDE");
+				if (stguide_id > 0)
+					send_vastart (stguide_id, "*:\\cflib.hyp");
 				break;
 
 			case UNDO:
@@ -469,6 +469,7 @@ main (void)
 	extern char __Ident_cflib[];
 	OBJECT *tree;
 	char tmp[20];
+	short  msg[8];
 
 	init_app ("demo.rsc");
 	init_colorpop (8);

cflib/filesel.c

@@ -116,7 +116,7 @@ do_magx (char *path, char *name, char *mask, char *title, FSEL_CB open_cb)
 		}
 		pat[j++] = '\0';
 	}
-	for (i = 0; i < 5; i++)
+	for (i = 0; i < 3; i++)
 		pat[j++] = def_mask[i];
 
 	if (path[0] != '\0')

cflib/fontsel.c

@@ -54,14 +54,14 @@ __extension__ \
  \
 	__asm__ volatile \
 	( \
-		"movl	%3,sp@-\n\t" \
-		"movw	%2,sp@-\n\t" \
-		"movl	%1,a0\n\t" \
-		"jsr	a0@\n\t" \
-		"addql	#6,sp" \
+		"movl	%3,%%sp@-\n\t" \
+		"movw	%2,%%sp@-\n\t" \
+		"movl	%1,%%a0\n\t" \
+		"jsr	%%a0@\n\t" \
+		"addql	#6,%%sp" \
 	: "=r"(retvalue)				/* output */ \
 	: "r"(f), "r"(w), "r"(l)	/* input */ \
-	: __CLOBBER_RETURN("d0") "d1", "a0", "a1"	/* clobbered regs */	\
+	: __CLOBBER_RETURN("d0") "d1", "a0", "a1", "cc"	/* clobbered regs */	\
 	AND_MEMORY \
   ); \
   retvalue; \
@@ -74,14 +74,14 @@ __extension__ \
  \
 	__asm__ volatile \
 	( \
-		"movl	%3,sp@-\n\t" \
-		"movw	%2,sp@-\n\t" \
-		"movl	%1,a0\n\t" \
-		"jsr	a0@\n\t" \
-		"addql	#6,sp" \
+		"movl	%3,%%sp@-\n\t" \
+		"movw	%2,%%sp@-\n\t" \
+		"movl	%1,%%a0\n\t" \
+		"jsr	%%a0@\n\t" \
+		"addql	#6,%%sp" \
 	: "=r"(retvalue)				/* output */ \
 	: "r"(f), "r"(w), "r"(l)	/* input */ \
-	: __CLOBBER_RETURN("d0") "d1", "a0", "a1"	/* clobbered regs */	\
+	: __CLOBBER_RETURN("d0") "d1", "a0", "a1", "cc"	/* clobbered regs */	\
 	AND_MEMORY \
   ); \
   retvalue; \
@@ -94,13 +94,13 @@ __extension__ \
  \
 	__asm__ volatile \
 	( \
-		"movw	%2,sp@-\n\t" \
-		"movl	%1,a0\n\t" \
-		"jsr	a0@\n\t" \
-		"addql	#2,sp" \
+		"movw	%2,%%sp@-\n\t" \
+		"movl	%1,%%a0\n\t" \
+		"jsr	%%a0@\n\t" \
+		"addql	#2,%%sp" \
 	: "=r"(retvalue)		/* outputs */ \
 	: "r"(f), "r"(w)		/* inputs */ \
-	: __CLOBBER_RETURN("d0") "d1", "a0", "a1"	/* clobbered regs */	\
+	: __CLOBBER_RETURN("d0") "d1", "a0", "a1", "cc"	/* clobbered regs */	\
 	AND_MEMORY \
   ); \
   retvalue; \

cflib/inline.h

@@ -1,29 +1,95 @@
-/* Resource Datei Indizes f�r INLINE */
-
-#define ALERTBOX         0   /* Formular/Dialog */
-#define AL_TITLE         1   /* STRING in Baum ALERTBOX */
-#define AL_INFO          2   /* IMAGE in Baum ALERTBOX */
-#define AL_ACHT          3   /* IMAGE in Baum ALERTBOX */
-#define AL_QST           4   /* IMAGE in Baum ALERTBOX */
-#define AL_STOP          5   /* IMAGE in Baum ALERTBOX */
-#define AL_STR1          6   /* STRING in Baum ALERTBOX */
-#define AL_STR2          7   /* STRING in Baum ALERTBOX */
-#define AL_STR3          8   /* STRING in Baum ALERTBOX */
-#define AL_STR4          9   /* STRING in Baum ALERTBOX */
-#define AL_STR5          10  /* STRING in Baum ALERTBOX */
-#define AL_BUT1          11  /* BUTTON in Baum ALERTBOX */
-#define AL_BUT2          12  /* BUTTON in Baum ALERTBOX */
-#define AL_BUT3          13  /* BUTTON in Baum ALERTBOX */
-
-#define ASCIITAB         1   /* Formular/Dialog */
-#define AT_TITLE         1   /* STRING in Baum ASCIITAB */
-#define AT_BOX           2   /* IBOX in Baum ASCIITAB */
-#define AT_DEZ           4   /* TEXT in Baum ASCIITAB */
-#define AT_HEX           6   /* TEXT in Baum ASCIITAB */
-#define AT_ABBRUCH       7   /* BUTTON in Baum ASCIITAB */
-
-#define BUTTONS          2   /* Formular/Dialog */
-#define BT_RADIO         1   /* USERDEF in Baum BUTTONS */
-#define BT_CHECK         2   /* USERDEF in Baum BUTTONS */
-#define BT_RLOW          3   /* USERDEF in Baum BUTTONS */
-#define BT_CLOW          4   /* USERDEF in Baum BUTTONS */
+/*
+ * resource set indices for inline
+ *
+ * created by ORCS 2.15
+ */
+
+/*
+ * Number of Strings:        23
+ * Number of Bitblks:        4
+ * Number of Iconblks:       0
+ * Number of Color Iconblks: 4
+ * Number of Color Icons:    8
+ * Number of Tedinfos:       2
+ * Number of Free Strings:   0
+ * Number of Free Images:    0
+ * Number of Objects:        27
+ * Number of Trees:          3
+ * Number of Userblks:       0
+ * Number of Images:         4
+ * Total file size:          5636
+ */
+
+#undef RSC_NAME
+#ifndef __ALCYON__
+#define RSC_NAME "inline"
+#endif
+#undef RSC_ID
+#ifdef inline
+#define RSC_ID inline
+#else
+#define RSC_ID 0
+#endif
+
+#ifndef RSC_STATIC_FILE
+# define RSC_STATIC_FILE 0
+#endif
+#if !RSC_STATIC_FILE
+#define NUM_STRINGS 23
+#define NUM_FRSTR 0
+#define NUM_UD 0
+#define NUM_IMAGES 4
+#define NUM_BB 4
+#define NUM_FRIMG 0
+#define NUM_IB 0
+#define NUM_CIB 4
+#define NUM_TI 2
+#define NUM_OBS 27
+#define NUM_TREE 3
+#endif
+
+
+
+#define ALERTBOX           0 /* form/dialog */
+#define AL_TITLE           1 /* STRING in tree ALERTBOX */
+#define AL_INFO            2 /* IMAGE in tree ALERTBOX */
+#define AL_ACHT            3 /* IMAGE in tree ALERTBOX */
+#define AL_QST             4 /* IMAGE in tree ALERTBOX */
+#define AL_STOP            5 /* IMAGE in tree ALERTBOX */
+#define AL_STR1            6 /* STRING in tree ALERTBOX */
+#define AL_STR2            7 /* STRING in tree ALERTBOX */
+#define AL_STR3            8 /* STRING in tree ALERTBOX */
+#define AL_STR4            9 /* STRING in tree ALERTBOX */
+#define AL_STR5           10 /* STRING in tree ALERTBOX */
+#define AL_BUT1           11 /* BUTTON in tree ALERTBOX */
+#define AL_BUT2           12 /* BUTTON in tree ALERTBOX */
+#define AL_BUT3           13 /* BUTTON in tree ALERTBOX */
+
+#define ASCIITAB           1 /* form/dialog */
+#define AT_TITLE           1 /* STRING in tree ASCIITAB */
+#define AT_BOX             2 /* IBOX in tree ASCIITAB */
+#define AT_DEZ             4 /* TEXT in tree ASCIITAB */ /* max len 3 */
+#define AT_HEX             6 /* TEXT in tree ASCIITAB */ /* max len 4 */
+#define AT_ABBRUCH         7 /* BUTTON in tree ASCIITAB */
+
+#define BUTTONS            2 /* form/dialog */
+#define BT_RADIO           1 /* CICON in tree BUTTONS */ /* max len 1 */
+#define BT_CHECK           2 /* CICON in tree BUTTONS */ /* max len 1 */
+#define BT_RLOW            3 /* CICON in tree BUTTONS */ /* max len 1 */
+#define BT_CLOW            4 /* CICON in tree BUTTONS */ /* max len 1 */
+
+
+
+
+#ifdef __STDC__
+#ifndef _WORD
+#  ifdef WORD
+#    define _WORD WORD
+#  else
+#    define _WORD short
+#  endif
+#endif
+extern _WORD inline_rsc_load(void);
+extern _WORD inline_rsc_gaddr(_WORD type, _WORD idx, void *gaddr);
+extern _WORD inline_rsc_free(void);
+#endif