WebSVN – Kolibri OS – Path Comparison – / – /programs/ Rev 8271 and /programs/ Rev 8272

Regard whitespace Rev 8271 → Rev 8272

/programs/develop/ktcc/trunk/bin/kos32-tcc
Cannot display: file marked as a binary type.
svn:mime-type = application/x-executable

/programs/develop/ktcc/trunk/source/Makefile.linux32
9,5 → 9,7
$(CC) $(CFLAGS) $(LFLAGS) $(SRC) -o $(NAME)
install:
cp $(NAME) ../bin
compress:
upx $(NAME)
clean:
rm -f $(NAME)

 /programs/develop/ktcc/trunk/source/libtcc.c
 ,7 → 71,11
 #ifdef TCC_TARGET_MEOS
 #include "tccmeos.c"
 #endif
+#ifdef TCC_TARGET_MEOS_LINUX
+#include <libgen.h>
+#endif
 #endif /* ONE_SOURCE */
 /********************************************************/
 ,7 → 144,7
 }
 #endif
 #else // _WIN32
-#if defined TCC_TARGET_MEOS && ! TCC_TARGET_MEOS_LINUX
+#if defined TCC_TARGET_MEOS
 /* on Kolibri host, we suppose the lib and includes are at the location of 'tcc' /lib, /include */
 static void tcc_set_lib_path_kos(TCCState *s)
 {
 ,9 → 156,19
     *p = 0;
     tcc_set_lib_path(s, path);
 }
+#if defined TCC_TARGET_MEOS_LINUX
+static void tcc_set_lib_path_linux(TCCState *s)
+{
+    char buff[4096+1];
+    readlink("/proc/self/exe", buff, 4096);
+    const char *path = dirname(buff);
+    tcc_set_lib_path(s, path);
+}
 #endif
 #endif
+#endif
 /********************************************************/
 /* copy a string and truncate it. */
 PUB_FUNC char *pstrcpy(char *buf, int buf_size, const char *s)
 ,12 → 1106,18
 #ifdef _WIN32
     tcc_set_lib_path_w32(s);
 #else
 #if defined TCC_TARGET_MEOS && ! TCC_TARGET_MEOS_LINUX
     tcc_set_lib_path_kos(s);
 #else
+#ifdef TCC_TARGET_MEOS_LINUX
+    tcc_set_lib_path_linux(s);
+#else
     tcc_set_lib_path(s, CONFIG_TCCDIR);
 #endif
 #endif
+#endif
     s->output_type = 0;
     preprocess_new();
     s->include_stack_ptr = s->include_stack;