aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorHenry Kroll III <henry@comptune.com>2010-04-24 13:27:56 -0700
committerHenry Kroll III <henry@comptune.com>2010-04-24 13:27:56 -0700
commit80b4c698c24e715b666d36176e6cba2cdd009eb2 (patch)
tree45cde550f31f452d63193f3f73ce209cc888eee6 /Makefile
parentb0b29d8013a0946bdcac80ca52fca440e979076e (diff)
downloadtinycc-80b4c698c24e715b666d36176e6cba2cdd009eb2.tar.gz
tinycc-80b4c698c24e715b666d36176e6cba2cdd009eb2.tar.bz2
make win32 version of libtcc1.a for cross-compiler on x86 / x86_64
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 195b84c..77e5d18 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC
LIBS_P=
LIBS=.
-# My distro wants shared libs, not static ones
LIBTCCA=libtcc.a
ifdef DISABLE_STATIC
CFLAGS+=-fPIC
@@ -111,11 +110,11 @@ PROGS_CROSS=$(WIN64_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS)
else
ifeq ($(ARCH),i386)
NATIVE_FILES=$(I386_FILES)
-PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS)
+PROGS_CROSS=$(X64_CROSS) libtcc1_win32 $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS)
else
ifeq ($(ARCH),x86-64)
NATIVE_FILES=$(X86_64_FILES)
-PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS)
+PROGS_CROSS=$(I386_CROSS) libtcc1_win32 $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS)
else
ifeq ($(ARCH),arm)
NATIVE_FILES=$(ARM_FILES)
@@ -126,6 +125,7 @@ endif
endif
ifdef CONFIG_CROSS
+
PROGS+=$(PROGS_CROSS)
endif
@@ -179,7 +179,9 @@ libtcc.so.1: $(LIBTCC_OBJ)
$(CC) -shared -Wl,-soname,$@ -o $@.0 $^
ln -sf libtcc.so.1.0 libtcc.so.1
ln -sf libtcc.so.1.0 libtcc.so
-
+libtcc1_win32:
+ ./make_libtcc1_win32.sh
+
libtcc_test$(EXESUF): tests/libtcc_test.c $(LIBTCCA)
$(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS) $(LIBTCCL)