Make it build

(Don't get excited guys)

src/sbbs3/menuedit/GNUmakefile

@@ -13,10 +13,11 @@
 
 SRC_ROOT        =       ../..
 include $(SRC_ROOT)/build/Common.gmake
-CFLAGS	+=	$(UIFC_CFLAGS) $(XPDEV_CFLAGS)
-LDFLAGS	+=	$(UIFC_LDFLAGS) $(XPDEV_LDFLAGS)
+CFLAGS	+=	$(CIOLIB-MT_CFLAGS) $(UIFC-MT_CFLAGS) $(XPDEV-MT_CFLAGS)
+LDFLAGS	+=	$(CIOLIB-MT_LDFLAGS) $(UIFC-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS)
 
 # MenuEdit Build Rule
 $(MENUEDIT): $(OBJS)
 	@echo Linking $@
-	${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) $(OBJS) -o $@
+	${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) $(OBJS) -o $@ $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)
+

src/sbbs3/menuedit/menuedit.c

@@ -36,8 +36,8 @@
  ****************************************************************************/
 
 #include <stdlib.h>
-#include <malloc.h>		/* alloca */
 #include "genwrap.h"
+#include "ciolib.h"
 #include "uifc.h"
 #include "dirwrap.h"
 #include "ini_file.h"
@@ -93,15 +93,15 @@ static void edit_menu(char* path)
 	}
 
 	/* Read menu file */
-	SAFECOPY(prompt,iniGetString(fp,ROOT_SECTION, "prompt", "'Command: '", value));
-	SAFECOPY(exec,iniGetString(fp,ROOT_SECTION, "exec", "", value));
-	SAFECOPY(menu_file,iniGetString(fp,ROOT_SECTION, "menu_file", "", value));
-	SAFECOPY(menu_format,iniGetString(fp,ROOT_SECTION, "menu_format", "\1n\1h\1w%s \1b%s", value));
-	menu_column_width=iniGetInteger(fp,ROOT_SECTION,"menu_column_width", 39);
-	menu_reverse=iniGetBool(fp,ROOT_SECTION,"menu_reverse", FALSE);
+	SAFECOPY(prompt,iniReadString(fp,ROOT_SECTION, "prompt", "'Command: '", value));
+	SAFECOPY(exec,iniReadString(fp,ROOT_SECTION, "exec", "", value));
+	SAFECOPY(menu_file,iniReadString(fp,ROOT_SECTION, "menu_file", "", value));
+	SAFECOPY(menu_format,iniReadString(fp,ROOT_SECTION, "menu_format", "\1n\1h\1w%s \1b%s", value));
+	menu_column_width=iniReadInteger(fp,ROOT_SECTION,"menu_column_width", 39);
+	menu_reverse=iniReadBool(fp,ROOT_SECTION,"menu_reverse", FALSE);
 
-	hotkeys=iniGetBool(fp,ROOT_SECTION,"hotkeys",TRUE);
-	expert=iniGetBool(fp,ROOT_SECTION,"expert",TRUE);
+	hotkeys=iniReadBool(fp,ROOT_SECTION,"hotkeys",TRUE);
+	expert=iniReadBool(fp,ROOT_SECTION,"expert",TRUE);
 
 	fclose(fp);
 
@@ -242,11 +242,9 @@ int main(int argc, char **argv)
 	uifc.esc_delay=25;
 
 	uifc.size=sizeof(uifc);
-#if defined(USE_UIFC32)
 	if(!door_mode)
 		i=uifcini32(&uifc);  /* curses/conio */
 	else
-#endif
 		i=uifcinix(&uifc);  /* stdio */
 	if(i!=0) {
 		printf("!ERROR: UIFC library init returned: %d\n",i);

src/sbbs3/menuedit/objects.mk

@@ -7,9 +7,4 @@
 # LIBODIR, SLASH, and OFILE must be pre-defined
 
 
-OBJS	=	$(MTOBJODIR)$(DIRSEP)menuedit$(OFILE)\
-	        $(MTOBJODIR)$(DIRSEP)ini_file$(OFILE)\
-        	$(MTOBJODIR)$(DIRSEP)str_list$(OFILE)\
-		$(MTOBJODIR)$(DIRSEP)genwrap$(OFILE)\
-		$(MTOBJODIR)$(DIRSEP)dirwrap$(OFILE)\
-		$(MTOBJODIR)$(DIRSEP)uifcx$(OFILE)
+OBJS	=	$(MTOBJODIR)$(DIRSEP)menuedit$(OFILE)

src/sbbs3/menuedit/targets.mk

@@ -4,10 +4,12 @@
 
 # $Id$
 
-# EXEODIR, LIBODIR, SLASH, and EXEFILE must be pre-defined
+# EXEODIR, LIBODIR, DIRSEP, and EXEFILE must be pre-defined
 
-MENUEDIT=	$(EXEODIR)$(SLASH)menuedit$(EXEFILE) 
+MENUEDIT=	$(EXEODIR)$(DIRSEP)menuedit$(EXEFILE) 
 
-all:		$(EXEODIR) \
+all:		$(MTOBJODIR) \
+		$(EXEODIR) \
 		$(LIBODIR) \
+		xpdev-mt uifc-mt ciolib-mt \
 		$(MENUEDIT)