rln
/
rln
mirror of http://shamusworld.gotdns.org/git/rln
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed makefile to do automagic platform detection.

This commit is contained in:
James Hammons 2011-12-29 16:51:26 +00:00
parent 4d8573013a
commit 7a68775424
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
makefile
View File

@ -5,9 +5,25 @@ CC = gcc
PROGNAME = rln
LIBS =
# Figure out which system we're compiling for, and set the appropriate variables
OSTYPE := $(shell uname -a)
ifeq "$(findstring Msys,$(OSTYPE))" "Msys" # Win32
OSDEFINE := WIN32
else # ???
OSDEFINE := __GCCUNIX__
endif
# Change this to -DWIN32 for Windows :-)
CFLAGS = -g -I. -D__GCCUNIX__
#CFLAGS = -g -I. -D__GCCUNIX__
#CFLAGS = -g -I. -DWIN32
CFLAGS = -g -I. -D$(OSDEFINE)
SRCS = rln.c

7
rln.c
View File

@ -950,7 +950,8 @@ int dofile(char * fname, int flag, char * sym)
// Reached maximum file handles
if (hd == NHANDLES)
{
if (flush_handles()) return 1;
if (flush_handles())
return 1;
}
// Attempt to open input file
@ -2112,7 +2113,7 @@ int doinclude(char * fname, int handle, char * sym1, char * sym2, int segment)
unsigned symtype = 0;
fsize = FSIZE(handle); // Get size of include file
dsize = (fsize+secalign) & ~secalign; // Round up to a alignment boundary
dsize = (fsize + secalign) & ~secalign; // Round up to a alignment boundary
sym1len = strlen(sym1) + 1; // Get sym1 length + null termination
sym2len = strlen(sym2) + 1; // Get sym2 length + null termination
@ -2129,7 +2130,7 @@ int doinclude(char * fname, int handle, char * sym1, char * sym2, int segment)
}
// Read in binary data
if (read(handle, ptr+32, fsize) != fsize)
if (read(handle, ptr + 32, fsize) != fsize)
{
printf("File read error on %s\n", fname);
close(handle);