Changeset 20 for vis_dev/dev

Timestamp:

Jul 19, 2011, 1:47:50 PM (13 years ago)

Author:

cecile

Message:

main modified

Location:

vis_dev/dev

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (1 diff)
• utilities.c (modified) (1 diff)
• utilities.h (modified) (2 diffs)

vis_dev/dev/Makefile

@@ -3 +3 @@
 INCVISDIR=${LIBVISDIR}/include/
 INCGLUDIR=${LIBGLUDIR}/include/
+LIB=-lvis2 -lcu -lglu -lm -lbsd   -lreadline  -lfl
 
-a.out : main.c utilities.o 
-        gcc main.c -lm -L$(LIBGLUDIR) -lglu -L$(LIBVISDIR) -lvis2  -I$(INCVISDIR) -I$(INCGLUDIR)
+a.out : main.o utilities.o 
+        gcc  -lm -L$(LIBGLUDIR) -L$(LIBVISDIR) main.o utilities.o $(LIB)
 
+main.o : main.c
+        gcc -c main.c -I$(INCGLUDIR) -I$(INCVISDIR)
 utilities.o : utilities.c
-        gcc -c utilities.c -lm -L$(LIBGLUDIR) -lglu -L$(LIBVISDIR) -lvis2  -I$(INCVISDIR) -I$(INCGLUDIR)
+        gcc -c utilities.c -I$(INCGLUDIR) -I$(INCVISDIR)
 clean:
         rm *.o a.out

vis_dev/dev/main.c

@@ -1 +1 @@
 #include "stdio.h"
-#include "hrc.h"
-#include "ntk.h"
+#include "utilities.h"
 
 int main()
 {
-Hrc_Manager_t * hmge;
+  Hrc_Manager_t * hmgr1;
+  FILE * file1;
+    file1 =  fopen("example/and2.mv","r");
+        hmgr1 = rlmv( file1);
+        if(hmgr1 !=NULL)
+        {
+                 Hrc_Node_t * n = Hrc_ManagerReadRootNode(hmgr1);
+                printf("***** HRC : %s %d\n",  Hrc_NodeReadModelName(n));
+        }
+
   return 0;
 }

vis_dev/dev/utilities.c

@@ -452 +452 @@
         
 }
-

vis_dev/dev/utilities.h

@@ -16 +16 @@
 #include <stdio.h>
 #include <stdlib.h>
+/********************************************/
+/******* Vis magic formulae *****************/
+FILE *vis_stderr;
+FILE *vis_stdout;
+FILE *vis_historyFile;
+FILE *vis_stdpipe;
+array_t *vm_commandHistoryArray;
+char *vm_programName;
+/********************************************/
 
 
-static int
+int
 nodenameCompare(
   const void * node1,
@@ -33 +42 @@
   return (strcmp(name1, name2));
 } 
-
 // Read blifmv file 
 Hrc_Manager_t * rlmv(FILE * file);