Skip to content
This repository
Browse code

[wxhaskell-from-cvs @ 2004-02-19 11:20:08 by dleijen]

Updated configure/make/reimp to properly generate a versioned dll.
Otherwise, the runtime linker would look at the wrong dll (without
a version number).

darcs-hash:20040219112011-deb31-38db99e598137152b8e858180fce579568cd379c.gz
  • Loading branch information...
commit 31db8ae0a66dbce9d097135a8ba3be57a37c27ab 1 parent 08c134e
dleijen authored
BIN  bin/reimp.exe
Binary file not shown
2  bin/wxhaskell-register-template.bat
@@ -64,4 +64,4 @@ ECHO.
64 64 GOTO end
65 65
66 66 :end
67   -PAUSE
  67 +PAUSE
2  bin/wxhaskell-unregister-template.bat
@@ -42,4 +42,4 @@ ECHO.
42 42 GOTO end
43 43
44 44 :end
45   -PAUSE
  45 +PAUSE
19 configure
@@ -8,7 +8,7 @@
8 8 # See license.txt for details.
9 9 #------------------------------------------------------------------------
10 10
11   -# $Id: configure,v 1.28 2004/02/12 06:41:49 dleijen Exp $
  11 +# $Id: configure,v 1.29 2004/02/19 11:20:08 dleijen Exp $
12 12
13 13 #--------------------------------------------------------------------
14 14 # Variables
@@ -661,6 +661,13 @@ Package
661 661 }
662 662 EOF
663 663
  664 +# set version in msc project file
  665 +echo "update version number in visual c++ project file"
  666 +sed -e "s|wxc-[\\.0-9]\+\\.|wxc-${version}.|g" -e "s|wxcd-[\\.0-9]\+\\.|wxcd-${version}.|g" -e "s|\$|\\r|g" wxc/wxc.dsp > wxc/wxc.dsp.out
  667 +mv -f wxc/wxc.dsp.out wxc/wxc.dsp
  668 +
  669 +
  670 +# create utility scripts
664 671 echo "creating utility scripts"
665 672
666 673 # generate compress utility
@@ -680,20 +687,14 @@ fi
680 687 # generate windows installer files.
681 688 echo " - config/wxhaskell-register.bat"
682 689 echo "@SET wxclibname=${wxclibname}-${version}" > config/wxhaskell-register-temp
683   -cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat > config/wxhaskell-register.bat
  690 +cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat | sed -e "s|\$|\\r|g" > config/wxhaskell-register.bat
684 691 rm -f config/wxhaskell-register-temp
685 692
686 693 echo " - config/wxhaskell-unregister.bat"
687 694 echo "@SET wxclibname=${wxclibname}-${version}" > config/wxhaskell-unregister-temp
688   -cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat > config/wxhaskell-unregister.bat
  695 +cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
689 696 rm -f config/wxhaskell-unregister-temp
690 697
691   -# take care of newline problems on windows
692   -if test "$toolkit"="msw"; then
693   - if sh ./config.search "unix2dos"; then
694   - unix2dos config/wxhaskell-register.bat config/wxhaskell-unregister.bat 1> /dev/null 2> /dev/null
695   - fi
696   -fi
697 698
698 699 # generate maxosx installer files.
699 700 echo " - config/macosx-install.info"
9 makefile
@@ -4,7 +4,7 @@
4 4 # See "license.txt" for more details.
5 5 #-----------------------------------------------------------------------
6 6
7   -# $Id: makefile,v 1.57 2004/02/12 08:38:16 dleijen Exp $
  7 +# $Id: makefile,v 1.58 2004/02/19 11:20:09 dleijen Exp $
8 8
9 9 #--------------------------------------------------------------------------
10 10 # make [all] - build the libraries (in "lib").
@@ -683,6 +683,9 @@ $(WXCORE-CORE-OBJS) $(WXCORE-OBJS): $(WXCORE-IMPORTSDIR)/%.o: $(WXCORE-SRCDIR)/%
683 683
684 684 #--------------------------------------------------------------------------
685 685 # WXC: the C wrapper of the (C++) wxWindows API
  686 +#
  687 +# $(WXC-LIBNAME) is set in config/config.mk as it can be
  688 +# either "wxc" or "wxcd" for a debug version.
686 689 #--------------------------------------------------------------------------
687 690 WXC =wxc
688 691 WXC-CPATH =ewxw
@@ -744,9 +747,7 @@ wxc-uninstall:
744 747
745 748 # dynamic link library on mingw32/cygwin: generates wxc.dll and a libwxc.a import library
746 749 ifeq ($(WITHMSC),yes)
747   -$(basename $(WXC-LIB)).dll: $(MSC-LIB)
748   - $(CP) $(MSC-LIB) $(WXC-LIB)
749   - $(CP) $(MSC-ARCHIVE) $(WXC-ARCHIVE)
  750 + # it must be generated already
750 751 else
751 752 $(basename $(WXC-LIB)).dll: $(WXC-OBJS)
752 753 $(CXX) -shared -o $@ $^ $(WXC-LIBS) -Wl,--output-def,$(WXC-OUTDIR)/$(WXC).def,--out-implib,$(WXC-ARCHIVE)
8 wxc/wxc.dsp
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
53 53 # ADD BSC32 /nologo
54 54 LINK32=link.exe
55 55 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
56   -# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmsw.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /libpath:"..\..\wxWindows-2.4.2\lib"
  56 +# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmsw.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\out\wxc\wxc-0.5.dll" /libpath:"..\..\wxWindows-2.4.2\lib"
57 57 # Begin Special Build Tool
58 58 SOURCE="$(InputPath)"
59   -PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxc.lib move libwxc.a ..\out\wxc move wxc.def ..\out\wxc echo Done.
  59 +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxc-0.5.lib move libwxc-0.5.a ..\out\wxc move wxc-0.5.def ..\out\wxc echo Done.
60 60 # End Special Build Tool
61 61
62 62 !ELSEIF "$(CFG)" == "wxc - Win32 Debug"
@@ -83,10 +83,10 @@ BSC32=bscmake.exe
83 83 # ADD BSC32 /nologo
84 84 LINK32=link.exe
85 85 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
86   -# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\out\wxc\wxcd.dll" /pdbtype:sept /libpath:"..\..\wxWindows-2.4.2\lib"
  86 +# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\out\wxc\wxcd-0.5.dll" /pdbtype:sept /libpath:"..\..\wxWindows-2.4.2\lib"
87 87 # Begin Special Build Tool
88 88 SOURCE="$(InputPath)"
89   -PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxcd.lib move libwxcd.a ..\out\wxc move wxcd.def ..\out\wxc echo Done.
  89 +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxcd-0.5.lib move libwxcd-0.5.a ..\out\wxc move wxcd-0.5.def ..\out\wxc echo Done.
90 90 # End Special Build Tool
91 91
92 92 !ENDIF

0 comments on commit 31db8ae

Please sign in to comment.
Something went wrong with that request. Please try again.