Browse Source

fixes to build, use little endian, 32-bit for now

Kyle P Davis 10 years ago
parent
commit
ab827e0d57
4 changed files with 17 additions and 17 deletions
  1. 1 1
      rigsc.446/lint/xd
  2. 10 10
      rigsc.446/src/Makefile
  3. 1 1
      rigsc.446/src/erm.c
  4. 5 5
      rigsc.446/src/sevice.c

+ 1 - 1
rigsc.446/lint/xd

@@ -13,7 +13,7 @@ xcrg_8.c\
 xcrg_9.c\
 xcrg_10.c\
 -o rig_lint\
-$rig/../lib/riglib.a
+$rig/../lib/riglib.a -lm
 rm -f xcrg_0.c  xcrg_0.o 
 rm -f xcrg_1.c  xcrg_1.o 
 rm -f xcrg_2.c  xcrg_2.o 

+ 10 - 10
rigsc.446/src/Makefile

@@ -4,7 +4,7 @@
 #
 
 # C compiler to use (Compiler path can be changed by the user)
-CCFLAGS = -g
+CCFLAGS = -g -D LE -m32
 PCA =  cc $(CCFLAGS)  -c -D xsun=1 -I../include/
 # Specify -DLE for Little-endian architectures (Big-endian is default)!
 # Specify -Dbbs for BBS-version of scaner (LaTeX version is default)!
@@ -13,7 +13,7 @@ LIBS = -lm
 # This is for sin, cos, sqrt etc.
 
 #  Other things are usually not changed by the user
-.INIT:  check$(rig) 
+.INIT:  check$(rig)
 
 # -------------------------------------------------
 #  MACRO DEFINITIONS
@@ -26,7 +26,7 @@ RCF_SRC = defsun3.o ley_.o nef2.o ou2.o  sevice.o
 ICF_SRC = cim.o defsun3.o erm.o ic.o ley_.o scan.o scanmif.o usemod.o nef2.o ou2.o sevice.o
 
 
-# Object files for "rc -c" (library) 
+# Object files for "rc -c" (library)
 CCF_SRC = defsun3.o ley_.o scan.o scanmif.o usemod.o c1.o c2.o c3.o c4.o nef2.o ou2.o sevice.o
 
 
@@ -50,16 +50,16 @@ bins:     bin ../bin/rc ../bin/ic ../bin/v
 bin:
 	-mkdir ../bin
 ../bin/rc:$(RCF_SRC) rc_.o
-	cc $(CCFLAGS)  -o ../bin/rc rc_.o $(RCF_SRC) 
+	cc $(CCFLAGS)  -o ../bin/rc rc_.o $(RCF_SRC)
 
 ../bin/ic:$(ICF_SRC)
 	cc  $(CCFLAGS) -o ../bin/ic    $(ICF_SRC) $(LIBS)
 
 
-../bin/v:$(RCF_SRC) v.o 
+../bin/v:$(RCF_SRC) v.o
 	cc  $(CCFLAGS) -o ../bin/v  v.o  $(RCF_SRC) $(LIBS)
 
-../lib/riglib.a:$(CCF_SRC) 
+../lib/riglib.a:$(CCF_SRC)
 	@echo '*Starting creating library'
 	-mkdir ../lib
 	-rm -f ../lib/riglib.a
@@ -67,7 +67,7 @@ bin:
 	-ranlib ../lib/riglib.a
 	@echo '*Library created'
 
-../bin/anrig:$(INCLIB_SRC) ../lib/riglib.a 
+../bin/anrig:$(INCLIB_SRC) ../lib/riglib.a
 	cc  $(CCFLAGS) -w \
 	 -Ianrig/ -I../include/\
 	 anrig/xcrg.c  anrig/xcrg_0.c\
@@ -102,7 +102,7 @@ bin:
 
 ../bin/rig_lint: ../lint/rig_lint.rig ../bin/rc ../lib/riglib.a ../bin/anrig ../bin/genrigd
 	(cd ../lint;../bin/rc rig_lint -c -P '-O';cd ..)
-	-mv ../lint/rig_lint ../bin/  	
+	-mv ../lint/rig_lint ../bin/
 
 test: ../test/rigcrf.rig  ../bin/rc ../lib/riglib.a ../bin/anrig ../bin/genrigd
 	(cd ../test;\
@@ -151,10 +151,10 @@ check$(rig):
 	@echo VARIABLE rig have been set to $(rig)
 	@echo ---------------------------------------
 ##----------------------------------------
-# Prepare distribution 
+# Prepare distribution
 mkdist$(RFILE)$(RDIR):
 	@echo '*** to prepare for distribution write make mkdist RFILE=fff RDIR=/u/vaden/xyz/xyz/'
-mkdist: 
+mkdist:
 	(cd $(RDIR);\
 	$(rig)/rc $(RFILE);\
 	$(rig)/anrig;\

+ 1 - 1
rigsc.446/src/erm.c

@@ -2221,7 +2221,7 @@ Void push()
   /*========================================*/
   base++;
   if (base > varnum)
-     {err(1L); epilog();exit(); } /* VADIM CHANGED 8/6/95 */
+     {err(1L); epilog();exit(1); } /* VADIM CHANGED 8/6/95 */
 }
 
 

+ 5 - 5
rigsc.446/src/sevice.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <floatingpoint.h>
+//#include <floatingpoint.h>
 #include "globrig.h"
 #include "define.h"
 #include "defpage.h"
@@ -108,7 +108,7 @@ double ar;
       sprintf(bs, " %s", strcpy(STR1, bs));
   }
  strcpy(Result,bs);  /* Splitted manually */
- return Result;  
+ return Result;
  }
 
 
@@ -192,7 +192,7 @@ long int_;
     sprintf(STR1, "%c", (Char)(int_ % 10 + rezstr + '0'));
     strcpy(rezstr, STR1);
  p2c: defsun3.z, line 541:
- * Note: Using % for possibly-negative arguments [317] 
+ * Note: Using % for possibly-negative arguments [317]
     int_ /= 10;
   } while (int_ != 0);
   if (neg)
@@ -259,11 +259,11 @@ long *code;
 {
     char * res; /* Help variable , used to analyze the result of "strtod" */
     res=st_;
-    *r=strtod(st_,&res); 
+    *r=strtod(st_,&res);
     if ((res != st_)&&(res>=st_+strlen(st_)))
         *code=0; /* Correct value */
     else *code=1; /* Incorrect value */
-    
+
 
 /*
   string80 st;