diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-04-28 20:58:19 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-04-28 20:58:19 (GMT) |
| commit | b18654a8e217dbed5dcd8ce8e9b38ba25b1b34dd (patch) | |
| tree | 476ffd14bcbb21c24c920a960549e879eb270b1e /ds9/win | |
| parent | 276248924f179411396352ecc80e34adb592a247 (diff) | |
| download | blt-b18654a8e217dbed5dcd8ce8e9b38ba25b1b34dd.zip blt-b18654a8e217dbed5dcd8ce8e9b38ba25b1b34dd.tar.gz blt-b18654a8e217dbed5dcd8ce8e9b38ba25b1b34dd.tar.bz2 | |
add tls for https support win32
Diffstat (limited to 'ds9/win')
| -rwxr-xr-x | ds9/win/Makefile.in | 27 | ||||
| -rwxr-xr-x | ds9/win/configure | 4 | ||||
| -rw-r--r-- | ds9/win/configure.ac | 3 | ||||
| -rw-r--r-- | ds9/win/ds9.C | 2 |
4 files changed, 17 insertions, 19 deletions
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index 0e48519..bbe162b 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -32,7 +32,8 @@ tkimgwindow_LIB_SPEC= @tkimgwindow_LIB_SPEC@ tcliis_LIB_SPEC = @tcliis_LIB_SPEC@ tclxml_LIB_SPEC = @tclxml_LIB_SPEC@ -tls_LIB_SPEC =@tls_LIB_SPEC@ + +tls_LIB_SPEC = @tls_LIB_SPEC@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@ @@ -52,7 +53,7 @@ PKG_CFLAGS = @PKG_CFLAGS@ DEFS = @DEFS@ $(PKG_CFLAGS) CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ @SSLLIBS@ +LIBS = @PKG_LIBS@ @LIBS@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -122,6 +123,7 @@ PREQS = \ $(LIBDIR)/doc \ $(LIBDIR)/cmaps \ $(LIBDIR)/template \ + $(LIBDIR)/tls \ $(LIBDIR)/tkblt \ $(LIBDIR)/tkcon \ $(LIBDIR)/base64 \ @@ -131,9 +133,8 @@ PREQS = \ $(LIBDIR)/math \ $(APPDIR)/xpans.exe \ $(APPDIR)/install.vbs \ - $(APPDIR)/libeay32.dll \ - $(APPDIR)/ssleay32.dll \ - $(APPDIR)/tcc + $(APPDIR)/tcc \ + stuff #--------------------------main @@ -156,7 +157,10 @@ ds9Base.exe: $(OBJS) $(LLIBS) $(LLIBS) \ $(TK_LIBS) \ $(LIBS) \ - -mwindows -static + -L /home/joye/openssl-1.0.2k -lssl -lcrypto \ + -lgdi32 \ + -mwindows +#-static winMain.o : winMain.c $(COMPILE) \ @@ -198,11 +202,12 @@ $(APPDIR)/tcc: $(prefix)/compilers/tcc-0.9.25-win32-bin.zip chmod +x $@/tcc.exe touch $@ -$(APPDIR)/libeay32.dll: c:/opt/bin/libeay32.dll - cp -p $? $@ - -$(APPDIR)/ssleay32.dll: c:/opt/bin/ssleay32.dll - cp -p $? $@ +stuff: + cp /home/joye/openssl-1.0.2k/ssleay32.dll $(APPDIR) + cp /home/joye/openssl-1.0.2k/libeay32.dll $(APPDIR) + cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll $(APPDIR) + cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libstdc++-6.dll $(APPDIR) + cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libwinpthread-1.dll $(APPDIR) #--------------------------clean diff --git a/ds9/win/configure b/ds9/win/configure index b529602..e71c2ce 100755 --- a/ds9/win/configure +++ b/ds9/win/configure @@ -655,7 +655,6 @@ STUBS_BUILD SHARED_BUILD TK_INCLUDES TCL_INCLUDES -SSLLIBS MATH_LIBS EGREP GREP @@ -10848,9 +10847,6 @@ done #TEA_ADD_STUB_SOURCES([]) #TEA_ADD_TCL_SOURCES([]) -SSLLIBS="-LC:/opt/openssl/lib -lssleay32 -llibeay32" - - #-------------------------------------------------------------------- # __CHANGE__ # diff --git a/ds9/win/configure.ac b/ds9/win/configure.ac index 8c189ff..eb30ac6 100644 --- a/ds9/win/configure.ac +++ b/ds9/win/configure.ac @@ -140,9 +140,6 @@ TEA_ADD_LIBS([-lstdc++]) #TEA_ADD_STUB_SOURCES([]) #TEA_ADD_TCL_SOURCES([]) -SSLLIBS="-LC:/opt/openssl/lib -lssleay32 -llibeay32" -AC_SUBST(SSLLIBS) - #-------------------------------------------------------------------- # __CHANGE__ # diff --git a/ds9/win/ds9.C b/ds9/win/ds9.C index fa3e871..2637003 100644 --- a/ds9/win/ds9.C +++ b/ds9/win/ds9.C @@ -143,7 +143,7 @@ int SAOAppInit(Tcl_Interp *interp) if (Tls_Init(interp) == TCL_ERROR) return TCL_ERROR; Tcl_StaticPackage (interp, "tls", Tls_Init, - (Tcl_PackageInitProc*)NULL); + (Tcl_PackageInitProc*)NULL); // Tksao if (Tksao_Init(interp) == TCL_ERROR) |