summaryrefslogtreecommitdiff
path: root/altosui/Makefile.am
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-08-21 22:52:45 -0700
committerKeith Packard <keithp@keithp.com>2011-08-22 17:20:06 -0700
commit393d231b9689cd1c358600ee76e0e808f89670c8 (patch)
tree051222cd385a6b2a966e63bde186aaa7a145ea8c /altosui/Makefile.am
parentd5bd40847b17c32405dfba864a2a5a3b19aa7e85 (diff)
altosui: Attempt to make both 32- and 64-bit windows DLLs
We'll see if they work... Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui/Makefile.am')
-rw-r--r--altosui/Makefile.am18
1 files changed, 16 insertions, 2 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index e4986ba5..f626d3fa 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -191,7 +191,7 @@ LINUX_EXTRA=altosui-fat
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
MACOSX_EXTRA=$(FIRMWARE)
-WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
@@ -282,10 +282,24 @@ libaltos.dylib:
-rm -f "$@"
$(LN_S) libaltos/"$@" .
-altos.dll:
+altos.dll: libaltos/altos.dll
-rm -f "$@"
$(LN_S) libaltos/"$@" .
+altos64.dll: libaltos/altos64.dll
+ -rm -f "$@"
+ $(LN_S) libaltos/"$@" .
+
+libaltos/altos.dll: build-altos-dll
+
+libaltos/altos64.dll: build-altos64-dll
+
+build-altos-dll:
+ +cd libaltos && make altos.dll
+
+build-altos64-dll:
+ +cd libaltos && make altos64.dll
+
$(FREETTS_CLASS):
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .