Permalink
Browse files

[wxhaskell-from-cvs @ 2005-04-29 10:00:26 by dleijen]

improved installation on ghc 6.4 systems

darcs-hash:20050429100037-deb31-67c9c3961b0e7675780c8b0d21b7061dc5133fcd.gz
  • Loading branch information...
1 parent 2739b2e commit 229b531352f7274daff200871df7f6e56189c9da dleijen committed Apr 29, 2005
View
@@ -53,5 +53,12 @@ if test ! -e "${bindir}/wx.pkg"; then
fi
# register the packages.
-env wxhlibdir=${libdir} ghc-pkg -u -i ${bindir}/wxcore.pkg
-env wxhlibdir=${libdir} ghc-pkg -u -i ${bindir}/wx.pkg
+if ghc-pkg list > /dev/null 2> /dev/null; then
+ # ghc-pkg 6.4 +
+ cat ${bindir}/wxcore.pkg | sed -e "s|\${wxhlibdir}|${libdir}|" | ghc-pkg update -
+ cat ${bindir}/wx.pkg | sed -e "s|\${wxhlibdir}|${libdir}|" | ghc-pkg update -
+else
+ # pre ghc-pkg 6.4
+ env wxhlibdir=%{wxhlibdir} %{hcpkg}-%{hcversion} -u -i %{wxhlibdir}/wxcore.pkg
+ env wxhlibdir=%{wxhlibdir} %{hcpkg}-%{hcversion} -u -i %{wxhlibdir}/wx.pkg
+fi
@@ -21,13 +21,29 @@ SET installdir=%CURDIR%
GOTO check
:check
-IF NOT EXIST %installdir%\bin\wx.pkg GOTO notfound
+IF "%generate%"=="yes" GOTO generate
+GOTO checkfile
+
+:generate
+IF NOT EXIST %installdir%\bin\wx-partial.pkg GOTO notfound
+COPY /Y %installdir%\bin\wx-partial.pkg %installdir%\bin\wx.pkg
+ECHO import-dirs:%installdir%\lib\imports >> %installdir%\bin\wx.pkg
+ECHO library-dirs:%installdir%\lib >> %installdir%\bin\wx.pkg
+COPY /Y %installdir%\bin\wxcore-partial.pkg %installdir%\bin\wxcore.pkg
+ECHO import-dirs:%installdir%\lib\imports >> %installdir%\bin\wxcore.pkg
+ECHO library-dirs:%installdir%\lib >> %installdir%\bin\wxcore.pkg
+GOTO checkfile
+
+:checkfile
+IF NOT EXIST "%installdir%\bin\wx.pkg" GOTO notfound
:install
ECHO - register packages
SET wxhlibdir=%installdir%\lib
-ghc-pkg -u -i "%installdir%\bin\wxcore.pkg"
-ghc-pkg -u -i "%installdir%\bin\wx.pkg"
+${hcregister} "%installdir%\bin\wxcore.pkg"
+${hcregister} "%installdir%\bin\wx.pkg"
+
+IF ERRORLEVEL 1 GOTO regerror
ECHO.
IF "%OS%"=="Windows_NT" GOTO copyNT
@@ -45,6 +61,13 @@ IF ERRORLEVEL 1 GOTO copyerror
ECHO - done!
GOTO end
+:regerror
+ECHO error:
+ECHO Unable to register the package using "ghc-pkg".
+ECHO Maybe you have an incompatible version of ghc installed?
+ECHO.
+goto end
+
:copyerror
ECHO error:
ECHO Unable to copy dynamic link libraries to the system folder.
@@ -63,13 +63,24 @@ mv %buildroot%{wxhlibdir}/%{libwxc} %buildroot%{_libdir}
rm -rf $RPM_BUILD_ROOT
%post %{wxhpackage}
-env wxhlibdir=%{wxhlibdir} %{hcpkg}-%{hcversion} -u -i %{wxhlibdir}/wxcore.pkg
-env wxhlibdir=%{wxhlibdir} %{hcpkg}-%{hcversion} -u -i %{wxhlibdir}/wx.pkg
+if %{hc-pkg}-%{version} list > /dev/null 2> /dev/null; then
+ wxhlibdir=%{wxhlibdir}
+ cat %{wxhlibdir}/wxcore.pkg | sed -e "s|\${wxhlibdir}|${wxhlibdir}|" | %{hcpkg}-%{hcversion} update -
+ cat %{wxhlibdir}/wx.pkg | sed -e "s|\${wxhlibdir}|${wxhlibdir}|" | %{hcpkg}-%{hcversion} update -
+else
+ env wxhlibdir=%{wxhlibdir} %{hcpkg}-%{hcversion} -u -i %{wxhlibdir}/wxcore.pkg
+ env wxhlibdir=%{wxhlibdir} %{hcpkg}-%{hcversion} -u -i %{wxhlibdir}/wx.pkg
+fi
%preun %{wxhpackage}
if [ "$1" = 0 ]; then
- %{hcpkg}-%{hcversion} -r wx || :
- %{hcpkg}-%{hcversion} -r wxcore || :
+ if %{hc-pkg}-%{version} list > /dev/null 2> /dev/null; then
+ %{hcpkg}-%{hcversion} unregister wx || :
+ %{hcpkg}-%{hcversion} unregister wxcore || :
+ else
+ %{hcpkg}-%{hcversion} -r wx || :
+ %{hcpkg}-%{hcversion} -r wxcore || :
+ fi
fi
%files %{wxhpackage}
@@ -78,6 +89,8 @@ fi
%{_libdir}/%{libwxc}
%changelog
+* Fri Apr 30 2005 Daan Leijen <http://www.cs.uu.nl/~daan> - 0.9.4
+- Updated for ghc-pkg version 6.4+
* Fri Mar 26 2004 Daan Leijen <http://www.cs.uu.nl/~daan> - 0.7-0
- Initial build
- Original spec file was kindly provided by Jens Petersen <petersen@haskell.org>.
@@ -9,8 +9,8 @@ IF "%1"=="/?" GOTO help
ECHO uninstall wxhaskell:
ECHO - unregister packages
-ghc-pkg -r wx
-ghc-pkg -r wxcore
+${hcunregister} wx
+${hcunregister} wxcore
ECHO.
ECHO - removing wxhaskell libraries from the windows system directory
View
104 configure
@@ -11,7 +11,7 @@
#--------------------------------------------------------------------
# Versioning
#--------------------------------------------------------------------
-version="1.0"
+version="0.9.4"
release="0"
#--------------------------------------------------------------------
@@ -529,9 +529,16 @@ fi
hcname="$hc"
ghcold="no"
+if findprogram "basename"; then
+ hcbasename="`basename $hcname | sed -e 's|-[0-9].*||' -e 's|\..*||'`"
+else
+ hcbasename="`echo $hcname | sed -e 's|-[0-9].*||' -e 's|\..*||'`"
+fi
+
+
# check ghc version
hcversion="`$hc --version | sed -e 's|[A-Za-z \t,]*||'`"
-if test "$hc" = "ghc"; then
+if test "$hcbasename" = "ghc"; then
case "$hcversion" in
0* | 1* | 2* | 3* | 4* | 5.*)
echo "WARNING:"
@@ -570,6 +577,13 @@ fi
# save name (hcpkg also gets flags)
hcpkgname="$hcpkg"
+if findprogram "basename"; then
+ hcpkgbasename="`basename $hcpkgname | sed -e 's|-[0-9].*||' -e 's|\..*||'`"
+else
+ hcpkgbasename="`echo $hcpkgname | sed -e 's|-[0-9].*||' -e 's|\..*||'`"
+fi
+
+
# Add local package flags
if test "$hcpkglocal"; then
hc="$hc -package-conf $hcpkglocal"
@@ -741,6 +755,7 @@ TOOLKIT=$wxtoolkit
HC=$hc
HCVERSION=$hcversion
HCNAME=$hcname
+HCBASENAME=$hcbasename
HCFLAGS=
HCPKG=$hcpkg
GHCOLD=$ghcold
@@ -808,34 +823,74 @@ binversion="${wxtoolkit}${wxversion}-${version}"
#echo " package descriptions"
echo " config/wxcore.pkg"
if test "$ghcold" != "yes"; then
-cat > config/wxcore.pkg << EOF
+# ghc 6.4+, the partial packages are only used for the windows installer
+cat > config/wxcore-partial.pkg << EOF
name:wxcore
version:$version
-homepage:http://wxhaskell.sf.net
+homepage:http://wxhaskell.sourceforge.net
author:Daan Leijen
exposed:True
-exposed-modules: Graphics.UI.WXCore
-import-dirs:${libdir}/imports
-library-dirs:${libdir}
+exposed-modules: Graphics.UI.WXCore,
+ Graphics.UI.WXCore.WxcClasses,
+ Graphics.UI.WXCore.WxcClassInfo,
+ Graphics.UI.WXCore.WxcDefs,
+ Graphics.UI.WXCore.IntMap,
+ Graphics.UI.WXCore.Types,
+ Graphics.UI.WXCore.Defines,
+ Graphics.UI.WXCore.Draw,
+ Graphics.UI.WXCore.Events,
+ Graphics.UI.WXCore.Frame,
+ Graphics.UI.WXCore.Layout,
+ Graphics.UI.WXCore.Process,
+ Graphics.UI.WXCore.Print,
+ Graphics.UI.WXCore.Dialogs,
+ Graphics.UI.WXCore.Image,
+ Graphics.UI.WXCore.Controls,
+ Graphics.UI.WXCore.Db,
+ Graphics.UI.WXCore.OpenGL,
+ Graphics.UI.WXCore.WxcObject,
+ Graphics.UI.WXCore.WxcClassTypes,
+ Graphics.UI.WXCore.WxcTypes,
+ Graphics.UI.WXCore.WxcClassesAL,
+ Graphics.UI.WXCore.WxcClassesMZ
hs-libraries:wxcore,wxcore0,wxcore1,wxcore2
extra-libraries:${wxclibname}-${binversion}
depends: base,lang,haskell98,concurrent
extra-ld-opts:$extraldopts
EOF
+cp -f config/wxcore-partial.pkg config/wxcore.pkg
+echo "import-dirs:\${wxhlibdir}/imports" >> config/wxcore.pkg
+echo "library-dirs:\${wxhlibdir}" >> config/wxcore.pkg
+
echo " config/wx.pkg"
-cat > config/wx.pkg << EOF
+cat > config/wx-partial.pkg << EOF
name:wx
version:$version
-homepage:http://wxhaskell.sf.net
+homepage:http://wxhaskell.sourceforge.net
author:Daan Leijen
exposed:True
-exposed-modules: Graphics.UI.WX
-import-dirs:${libdir}/imports
-library-dirs:${libdir}
+exposed-modules: Graphics.UI.WX,
+ Graphics.UI.WX.Types,
+ Graphics.UI.WX.Attributes,
+ Graphics.UI.WX.Layout,
+ Graphics.UI.WX.Classes,
+ Graphics.UI.WX.Variable,
+ Graphics.UI.WX.Events,
+ Graphics.UI.WX.Window,
+ Graphics.UI.WX.Frame,
+ Graphics.UI.WX.Media,
+ Graphics.UI.WX.Menu,
+ Graphics.UI.WX.Timer,
+ Graphics.UI.WX.Draw,
+ Graphics.UI.WX.Controls,
+ Graphics.UI.WX.Dialogs
hs-libraries:wx
depends:wxcore-${version}
EOF
+cp -f config/wx-partial.pkg config/wx.pkg
+echo "import-dirs:\${wxhlibdir}/imports" >> config/wx.pkg
+echo "library-dirs:\${wxhlibdir}" >> config/wx.pkg
else
# pre ghc 6.4
@@ -884,12 +939,21 @@ fi
# generate windows installer files.
echo " config/wxhaskell-register.bat"
echo "@SET wxclibname=${wxclibname}-${binversion}" > config/wxhaskell-register-temp
-cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat | sed -e "s|\$|\\r|g" > config/wxhaskell-register.bat
+if test "$ghcold" = "yes"; then
+ cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat | sed -e "s|\${hcregister}|ghc-pkg -u -i|g" -e "s|\$|\\r|g" > config/wxhaskell-register.bat
+else
+ echo "@SET generate=yes" >> config/wxhaskell-register-temp
+ cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat | sed -e "s|\${hcregister}|ghc-pkg update|g" -e "s|\$|\\r|g" > config/wxhaskell-register.bat
+fi
rm -f config/wxhaskell-register-temp
echo " config/wxhaskell-unregister.bat"
echo "@SET wxclibname=${wxclibname}-${binversion}" > config/wxhaskell-unregister-temp
-cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
+if test "$ghcold" = "yes"; then
+ cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\${hcunregister}|ghc-pkg -r|g" -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
+else
+ cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\${hcunregister}|ghc-pkg unregister|g" -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
+fi
rm -f config/wxhaskell-unregister-temp
echo " config/setcd"
@@ -915,11 +979,20 @@ EOF
# generate macosx post-install files.
echo " config/macosx-postinstall"
+if test "$ghcold" = "yes"; then
cat > config/macosx-postinstall << EOF
#!/bin/sh
env wxhlibdir="$libdir" /usr/local/bin/ghc-pkg -u -i "\$1/Contents/Resources/wxcore.pkg"
env wxhlibdir="$libdir" /usr/local/bin/ghc-pkg -u -i "\$1/Contents/Resources/wx.pkg"
EOF
+else
+cat > config/macosx-postinstall << EOF
+#!/bin/sh
+cat "\$1/Contents/Resources/wxcore.pkg" | sed -e "s|\${wxhlibdir}|${libdir}|" | ghc-pkg update -
+cat "\$1/Contents/Resources/wx.pkg" | sed -e "s|\${wxhlibdir}|${libdir}|" | ghc-pkg update -
+EOF
+fi
+
chmod a+x config/macosx-postinstall
# generate macosx application builder script
@@ -935,8 +1008,7 @@ rm -f config/macosx-app-temp
chmod a+x config/macosx-app
# generate RPM spec file
-hcbasename="`echo $hcname | sed -e 's|-[0-9].*||'`"
-hcpkgbasename="`echo $hcpkgname | sed -e 's|-[0-9].*||'`"
+
# to uppercase
wxToolkit="`echo "$wxtoolkit" | sed -e 'y|abcdefghijklmnopqrstuvwxyz|ABCDEFGHIJKLMNOPQRSTUVWXYZ|'`"
View
@@ -290,7 +290,7 @@ endif
#.PHONY: wxc-bindist wxcore-bindist wx-bindist
WXHASKELLVER =wxhaskell-$(VERSION)
BIN-VERSION =$(TOOLKIT)$(WXWIN-VERSION)-$(VERSION)
-REL-VERSION =$(TOOLKIT)$(WXWIN-VERSION)-$(HCNAME)$(HCVERSION)-$(VERSION)-$(RELEASE)
+REL-VERSION =$(TOOLKIT)$(WXWIN-VERSION)-$(HCBASENAME)$(HCVERSION)-$(VERSION)-$(RELEASE)
DIST-OUTDIR =$(OUTDIR)
@@ -335,6 +335,9 @@ srcdist-clean:
bindist: all bindist-clean dist-dirs wxc-bindist wxcore-bindist wx-bindist docdist
@$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxcore.pkg config/wx.pkg)
ifeq ($(TOOLKIT),msw)
+ifeq ($(GHCOLD),no)
+ @$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxcore-partial.pkg config/wx-partial.pkg)
+endif
@$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxhaskell-register.bat config/wxhaskell-unregister.bat config/setcd)
else
@$(call cp-bindist,bin,$(BINDIST-BINDIR),bin/wxhaskell-register bin/wxhaskell-unregister)
@@ -493,7 +496,7 @@ wxcore-bindist: wxcore
# install
wxcore-register:
- @$(call install-pkg ,$(LIBDIR),$(WXCORE-PKG))
+ $(call install-pkg ,$(LIBDIR),$(WXCORE-PKG))
wxcore-install-files: wxcore wxc-install-files
@$(call install-files,$(WXCORE-OUTDIR),$(LIBDIR),$(WXCORE-BINS))
View
@@ -222,7 +222,11 @@ uninstall-files =$(call uninstall-filesx,$(2),$(call relative-fromto,$(patsubst
# install packages
# usage: $(call install-pkg,<install dir>,<package file>)
# usage: $(call uninstall-pkg,<package name>)
+ifeq ($(GHCOLD),yes)
install-pkg=env wxhlibdir=$(1) $(HCPKG) -u -i $(2)
+else
+install-pkg=cat $(2) | sed -e "s|\$${wxhlibdir}|$(1)|" | $(HCPKG) update -
+endif
uninstall-pkg=if $(call run-silent,$(HCPKG) -s $(1)); then echo "unregister package: $(1)" && $(HCPKG) -r $(1); fi
View
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# 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
-# 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-msw2.4.2-1.0.dll" /libpath:"..\..\wxWindows-2.4.2\lib"
+# 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-msw2.4.2-0.9.4.dll" /libpath:"..\..\wxWindows-2.4.2\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxc-msw2.4.2-1.0.lib move libwxc-msw2.4.2-1.0.a ..\out\wxc move wxc-msw2.4.2-1.0.def ..\out\wxc echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxc-msw2.4.2-0.9.4.lib move libwxc-msw2.4.2-0.9.4.a ..\out\wxc move wxc-msw2.4.2-0.9.4.def ..\out\wxc echo Done.
# End Special Build Tool
!ELSEIF "$(CFG)" == "wxc - Win32 Debug"
@@ -83,10 +83,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# 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
-# 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-msw2.4.2-1.0.dll" /pdbtype:sept /libpath:"..\..\wxWindows-2.4.2\lib"
+# 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-msw2.4.2-0.9.4.dll" /pdbtype:sept /libpath:"..\..\wxWindows-2.4.2\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxcd-msw2.4.2-1.0.lib move libwxcd-msw2.4.2-1.0.a ..\out\wxc move wxcd-msw2.4.2-1.0.def ..\out\wxc echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxcd-msw2.4.2-0.9.4.lib move libwxcd-msw2.4.2-0.9.4.a ..\out\wxc move wxcd-msw2.4.2-0.9.4.def ..\out\wxc echo Done.
# End Special Build Tool
!ENDIF
View
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# 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
-# ADD LINK32 wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase25.lib wxbase25_net.lib wxbase25_odbc.lib wxbase25_xml.lib wxmsw25_adv.lib wxmsw25_core.lib wxmsw25_dbgrid.lib wxmsw25_gl.lib wxmsw25_html.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-msw2.4.2-1.0.dll" /libpath:"..\..\wxWindows-2.5.1\lib\vc_lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase25.lib wxbase25_net.lib wxbase25_odbc.lib wxbase25_xml.lib wxmsw25_adv.lib wxmsw25_core.lib wxmsw25_dbgrid.lib wxmsw25_gl.lib wxmsw25_html.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-msw2.4.2-0.9.4.dll" /libpath:"..\..\wxWindows-2.5.1\lib\vc_lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxc-msw2.4.2-1.0.lib move libwxc-msw2.4.2-1.0.a ..\out\wxc move wxc-msw2.4.2-1.0.def ..\out\wxc echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxc-msw2.4.2-0.9.4.lib move libwxc-msw2.4.2-0.9.4.a ..\out\wxc move wxc-msw2.4.2-0.9.4.def ..\out\wxc echo Done.
# End Special Build Tool
!ELSEIF "$(CFG)" == "wxc - Win32 Debug"
@@ -83,10 +83,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# 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
-# ADD LINK32 wxmsw25d_core.lib wxmsw25d_adv.lib wxmsw25d_dbgrid.lib wxmsw25d_gl.lib wxmsw25d_html.lib wxbase25d.lib wxbase25d_net.lib wxbase25d_odbc.lib wxbase25d_xml.lib wxzlibd.lib wxregexd.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.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-msw2.4.2-1.0.dll" /pdbtype:sept /libpath:"..\..\wxWindows-2.5.1\lib\vc_lib"
+# ADD LINK32 wxmsw25d_core.lib wxmsw25d_adv.lib wxmsw25d_dbgrid.lib wxmsw25d_gl.lib wxmsw25d_html.lib wxbase25d.lib wxbase25d_net.lib wxbase25d_odbc.lib wxbase25d_xml.lib wxzlibd.lib wxregexd.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.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-msw2.4.2-0.9.4.dll" /pdbtype:sept /libpath:"..\..\wxWindows-2.5.1\lib\vc_lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxcd-msw2.4.2-1.0.lib move libwxcd-msw2.4.2-1.0.a ..\out\wxc move wxcd-msw2.4.2-1.0.def ..\out\wxc echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\out\wxc\wxcd-msw2.4.2-0.9.4.lib move libwxcd-msw2.4.2-0.9.4.a ..\out\wxc move wxcd-msw2.4.2-0.9.4.def ..\out\wxc echo Done.
# End Special Build Tool
!ENDIF

0 comments on commit 229b531

Please sign in to comment.