Commit 4a7ea90a authored by deuce's avatar deuce
Browse files

Updates for new make system...

mouse.c and ciolib.c need to include <stdlib.h> for malloc() etc.
parent e28d1798
CIOLIB-MT = $(CIOLIB_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)ciolib$(LIBFILE)
CIOLIB-MT = $(CIOLIB_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)ciolib-mt$(LIBFILE)
CIOLIB-MT_CFLAGS = -I$(CIOLIB_SRC)
CIOLIB-MT_LDFLAGS = -L$(CIOLIB_SRC)$(DIRSEP)$(LIBODIR)
CIOLIB-MT_LIBS = -lciolib
CIOLIB-MT_LIBS = -lciolib-mt
# smblib/Makefile
#########################################################################
# Makefile for Synchronet Message Base Library (SMBLIB) #
# For use with Borland C++ Builder 5+ or Borland C++ 5.5 for Win32 #
# @format.tab-size 4 #
# #
# usage: make #
#########################################################################
# $Id$
# Macros
#DEBUG = 1 # Comment out for release (non-debug) version
SRC_ROOT = ..
# Cross platform/compiler definitions
include $(SRC_ROOT)/build/Common.gmake # defines clean and output directory rules
CFLAGS += -I$(XPDEV_SRC) -I$(CIOLIB_SRC)
OBJS += $(OBJODIR)$(DIRSEP)curs_cio$(OFILE)
CFLAGS += $(XPDEV-MT_CFLAGS) $(CIOLIB-MT_CFLAGS)
OBJS += $(MTOBJODIR)$(DIRSEP)curs_cio$(OFILE)
ifndef NO_X
CFLAGS += -I/usr/X11R6/include
OBJS += $(OBJODIR)$(DIRSEP)console$(OFILE) \
$(OBJODIR)$(DIRSEP)x_cio$(OFILE)
OBJS += $(MTOBJODIR)$(DIRSEP)console$(OFILE) \
$(MTOBJODIR)$(DIRSEP)x_cio$(OFILE)
endif
# CIOLIB Library Link Rule
......
......@@ -13,10 +13,6 @@
# Macros
#DEBUG = 1 # Comment out for release (non-debug) version
# Enable auto-dependency checking
.autodepend
.cacheautodepend
SRC_ROOT = ..
# Cross platform/compiler definitions
!include ..\build\Common.bmake # defines clean and output directory rules
......
......@@ -2,6 +2,8 @@
#include <stdlib.h> /* malloc */
#include <stdio.h>
#include <threadwrap.h>
#define CIOLIB_NO_MACROS
#include "ciolib.h"
......@@ -371,10 +373,10 @@ char *ciolib_getpass(const char *prompt)
CIOLIB_INIT();
ciolib_cputs((char *)prompt);
while((ch=getch())!='\n') {
while((ch=ciolib_getch())!='\n') {
switch(ch) {
case 0: /* Skip extended keys */
getch();
ciolib_getch();
break;
case '\r': /* Skip \r (ToDo: Should this be treeated as a \n? */
break;
......
#include <stdlib.h>
#include <genwrap.h>
#include <ciolib.h>
#include <keys.h>
......
#include <stdlib.h>
#include <genwrap.h>
#include <semwrap.h>
#include <threadwrap.h>
......
# smblib/objects.mk
# Make 'include file' listing object files for SMBLIB
# $Id$
# OBJODIR, DIRSEP, and OFILE must be pre-defined
OBJS = $(MTOBJODIR)$(DIRSEP)ansi_cio$(OFILE)\
$(MTOBJODIR)$(DIRSEP)ciolib$(OFILE)\
$(MTOBJODIR)$(DIRSEP)cterm$(OFILE)\
......
# conio/targets.mk
default: mtlib
mtlib: $(LIBODIR) $(CIOLIB-MT)
mtlib: $(MTOBJODIR) $(LIBODIR) $(CIOLIB-MT)
......@@ -30,6 +30,7 @@ int win32_putch(int);
int win32_wherex(void);
int win32_wherey(void);
void win32_settitle(const char *title);
int win32_initciolib(long inmode);
#ifdef __cplusplus
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment