| @@ -10,7 +10,6 @@ CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC · 9 unmodified lines |
| 10 | LIBS_P= | 10 | LIBS_P= |
| 11 | LIBS=. | 11 | LIBS=. |
| 12 | | 12 | |
| 13 | # My distro wants shared libs, not static ones | | |
| 14 | LIBTCCA=libtcc.a | 13 | LIBTCCA=libtcc.a |
| 15 | ifdef DISABLE_STATIC | 14 | ifdef DISABLE_STATIC |
| 16 | CFLAGS+=-fPIC | 15 | CFLAGS+=-fPIC |
| @@ -111,11 +110,11 @@ PROGS_CROSS=$(WIN64_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS) · 94 unmodified lines |
| 111 | else | 110 | else |
| 112 | ifeq ($(ARCH),i386) | 111 | ifeq ($(ARCH),i386) |
| 113 | NATIVE_FILES=$(I386_FILES) | 112 | NATIVE_FILES=$(I386_FILES) |
| 114 | PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) | 113 | PROGS_CROSS=$(X64_CROSS) libtcc1_win32 $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) |
| 115 | else | 114 | else |
| 116 | ifeq ($(ARCH),x86-64) | 115 | ifeq ($(ARCH),x86-64) |
| 117 | NATIVE_FILES=$(X86_64_FILES) | 116 | NATIVE_FILES=$(X86_64_FILES) |
| 118 | PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) | 117 | PROGS_CROSS=$(I386_CROSS) libtcc1_win32 $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) |
| 119 | else | 118 | else |
| 120 | ifeq ($(ARCH),arm) | 119 | ifeq ($(ARCH),arm) |
| 121 | NATIVE_FILES=$(ARM_FILES) | 120 | NATIVE_FILES=$(ARM_FILES) |
| @@ -126,6 +125,7 @@ endif · 4 unmodified lines |
| 126 | endif | 125 | endif |
| 127 | | 126 | |
| 128 | ifdef CONFIG_CROSS | 127 | ifdef CONFIG_CROSS |
| | 128 | |
| 129 | PROGS+=$(PROGS_CROSS) | 129 | PROGS+=$(PROGS_CROSS) |
| 130 | endif | 130 | endif |
| 131 | | 131 | |
| @@ -179,7 +179,9 @@ libtcc.so.1: $(LIBTCC_OBJ) · 47 unmodified lines |
| 179 | $(CC) -shared -Wl,-soname,$@ -o $@.0 $^ | 179 | $(CC) -shared -Wl,-soname,$@ -o $@.0 $^ |
| 180 | ln -sf libtcc.so.1.0 libtcc.so.1 | 180 | ln -sf libtcc.so.1.0 libtcc.so.1 |
| 181 | ln -sf libtcc.so.1.0 libtcc.so | 181 | ln -sf libtcc.so.1.0 libtcc.so |
| 182 | | 182 | libtcc1_win32: |
| | 183 | ./make_libtcc1_win32.sh |
| | 184 | |
| 183 | libtcc_test$(EXESUF): tests/libtcc_test.c $(LIBTCCA) | 185 | libtcc_test$(EXESUF): tests/libtcc_test.c $(LIBTCCA) |
| 184 | $(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS) $(LIBTCCL) | 186 | $(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS) $(LIBTCCL) |
| 185 | | 187 | |