diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-05-03 20:30:06 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-05-03 20:30:06 (GMT) |
| commit | e688b7440be5d1629af26c141b0b1d38471c006a (patch) | |
| tree | 0ca50fe263f044f76914a30b648ca4086b74b3d1 /ds9/win | |
| parent | 8fc8e01b8a6b3eddf69473ef2429b77c9c91151f (diff) | |
| download | blt-e688b7440be5d1629af26c141b0b1d38471c006a.zip blt-e688b7440be5d1629af26c141b0b1d38471c006a.tar.gz blt-e688b7440be5d1629af26c141b0b1d38471c006a.tar.bz2 | |
add support for win32
Diffstat (limited to 'ds9/win')
| -rwxr-xr-x | ds9/win/Makefile.in | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index e258dff..87a6d92 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -43,10 +43,14 @@ tktable_LIB_SPEC= @tktable_LIB_SPEC@ tkwin_LIB_SPEC = @tkwin_LIB_SPEC@ CC = @CC@ +AR = @AR@ +RC = @RC@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ CFLAGS_WARNING = @CFLAGS_WARNING@ OBJEXT = @OBJEXT@ +DLLDIR = /usr/$(CC:-gcc=)/sys-root/mingw/bin + INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ PKG_CFLAGS = @PKG_CFLAGS@ @@ -57,8 +61,6 @@ LIBS = @PKG_LIBS@ @LIBS@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -STRIP = x86_64-w64-mingw32-strip.exe - .SUFFIXES: .c .C .$(OBJEXT) .c.@OBJEXT@: @@ -134,7 +136,7 @@ PREQS = \ $(APPDIR)/xpans.exe \ $(APPDIR)/install.vbs \ $(APPDIR)/tcc \ - stuff + DLLs #--------------------------main @@ -143,7 +145,7 @@ PREQS = \ $(APPDIR)/ds9.exe : ds9Base.exe $(PREQS) cp -p ds9base.exe ds9.exe - $(STRIP) ds9.exe + strip ds9.exe cp -p ds9.exe $(APPDIR)/. debug : ds9Base.exe $(PREQS) @@ -172,7 +174,7 @@ winMain.c : $(prefix)/tk$(TCL_VERSION)/win/winMain.c cp $(prefix)/tk$(TCL_VERSION)/win/winMain.c . ds9.res.o: ds9.rc ds9.ico - x86_64-w64-mingw32-windres -o $@ \ + $(RC) -o $@ \ --define STATIC_BUILD --include $(prefix)/tk$(TCL_VERSION)/generic \ --include $(prefix)/$(TCLDIR)/generic \ --include $(prefix)/tk$(TCL_VERSION)/win/rc \ @@ -202,13 +204,12 @@ $(APPDIR)/tcc: $(prefix)/compilers/tcc-0.9.25-win32-bin.zip chmod +x $@/tcc.exe touch $@ -stuff: +DLLs: cp $(prefix)/openssl/ssleay32.dll $(APPDIR) cp $(prefix)/openssl/libeay32.dll $(APPDIR) -# cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll $(APPDIR) - cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcc_s_seh-1.dll $(APPDIR) - cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libstdc++-6.dll $(APPDIR) - cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libwinpthread-1.dll $(APPDIR) + cp $(DLLDIR)/libgcc_s_s*-1.dll $(APPDIR) + cp $(DLLDIR)/libstdc++-6.dll $(APPDIR) + cp $(DLLDIR)/libwinpthread-1.dll $(APPDIR) #--------------------------clean |