diff options
| author | Keith Packard <keithp@keithp.com> | 2014-01-01 22:02:56 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-01 22:02:56 -0800 |
| commit | 8bff2822c242d2878b408b9c0d8a7647108ea4b1 (patch) | |
| tree | 88d29b0cc1a9488d05657119f5fda5a4fa221f7c /altosui | |
| parent | 95d77eaff708397d8b1e29904dc47d8ea09e8754 (diff) | |
libaltos: Build -m64 and -m32 for fat tarball when possible
Check to see if we can compile libaltos for both 32 bit and 64 bit
systems, and then use those when generating the linux tarball.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui')
| -rw-r--r-- | altosui/Makefile.am | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 71e96004..dc34c444 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -175,7 +175,13 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) -LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) +if MULTI_ARCH +LINUX_LIBS=libaltos32.so libaltos64.so +else +LINUX_LIBS=libaltos.so +endif + +LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) LINUX_EXTRA=altosui-fat MACOSX_INFO_PLIST=Info.plist @@ -269,6 +275,14 @@ libaltos.so: build-libaltos -rm -f "$@" $(LN_S) ../libaltos/.libs/"$@" . +libaltos32.so: build-libaltos + -rm -f "$@" + $(LN_S) ../libaltos/.libs/"$@" . + +libaltos64.so: build-libaltos + -rm -f "$@" + $(LN_S) ../libaltos/.libs/"$@" . + libaltos.dylib: -rm -f "$@" $(LN_S) ../libaltos/"$@" . |