libtcc: new api tcc_set_lib_path

grischka committed 17 years ago

Commit d165e871 parent 73ba0784 files · +26 −12Browse files

Unified · Split

4 files

@@ -305,7 +305,7 @@ libtcc_test$(EXESUF): libtcc_test.c libtcc.a · 304 unmodified lines
305	$(CC) $(CFLAGS) -o $@ $< libtcc.a $(LIBS)	305	$(CC) $(CFLAGS) -o $@ $< libtcc.a $(LIBS)
306		306
307	libtest: libtcc_test	307	libtest: libtcc_test
308	./libtcc_test	308	./libtcc_test lib_path=.
309		309
310	# targets for development	310	# targets for development
311		311

@@ -92,6 +92,9 @@ int tcc_relocate(TCCState s1, void ptr); · 91 unmodified lines
92	/* return symbol value or NULL if not found */	92	/* return symbol value or NULL if not found */
93	void tcc_get_symbol(TCCState s, const char *name);	93	void tcc_get_symbol(TCCState s, const char *name);
94		94
		95	/* set CONFIG_TCCDIR at runtime */
		96	void tcc_set_lib_path(TCCState s, const char path);
		97
95	#ifdef __cplusplus	98	#ifdef __cplusplus
96	}	99	}
97	#endif	100	#endif

  */
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "libtcc.h"
     return a + b;
 }
 char my_program[] =
 "int fib(int n)\n"
 "{\n"
 "    if (n <= 2)\n"
     int (*func)(int);
     void *mem;
     int size;
     s = tcc_new();
     if (!s) {
         fprintf(stderr, "Could not create tcc state\n");
         exit(1);
     }
-    /* MUST BE CALLED before any compilation or file loading */
+    /* if tcclib.h and libtcc1.a are not installed, where can we find them */
+    if (argc == 2 && !memcmp(argv[1], "lib_path=",9))
+        tcc_set_lib_path(s, argv[1]+9);
+    /* MUST BE CALLED before any compilation */
     tcc_set_output_type(s, TCC_OUTPUT_MEMORY);
-    tcc_compile_string(s, my_program);
+    if (tcc_compile_string(s, my_program) == -1)
+        return 1;
     /* as a test, we add a symbol that the compiled program can use.
        You may also open a dll with tcc_add_dll() and use symbols from that */
     tcc_add_symbol(s, "add", add);
     /* get needed size of the code */
     size = tcc_relocate(s, NULL);
     if (size == -1)

tcc.c+11−6

     return path;
 }
-char *w32_tcc_lib_path(void)
+void tcc_set_lib_path_w32(TCCState *s)
 {
     /* on win32, we suppose the lib and includes are at the location
        of 'tcc.exe' */
     else if (p > path)
         p--;
     *p = 0;
-    return strdup(path);
+    tcc_set_lib_path(s, path);
 }
 #endif
                     flag_name, value);
 }
+/* set CONFIG_TCCDIR at runtime */
+void tcc_set_lib_path(TCCState *s, const char *path)
+{
+    tcc_lib_path = tcc_strdup(path);
+}
 #if !defined(LIBTCC)
 static int64_t getclock_us(void)
                 break;
             case TCC_OPTION_B:
                 /* set tcc utilities path (mainly for tcc development) */
-                tcc_lib_path = optarg;
+                tcc_set_lib_path(s, optarg);
                 break;
             case TCC_OPTION_l:
                 dynarray_add((void ***)&files, &nb_files, r);
     char objfilename[1024];
     int64_t start_time = 0;
+    s = tcc_new();
 #ifdef _WIN32
-    tcc_lib_path = w32_tcc_lib_path();
+    tcc_set_lib_path_w32(s);
 #endif
-    s = tcc_new();
     output_type = TCC_OUTPUT_EXE;
     outfile = NULL;
     multiple_files = 1;

Keyboard shortcuts