Skip to content
Browse files

[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...
1 parent 08c134e commit 31db8ae0a66dbce9d097135a8ba3be57a37c27ab dleijen committed
Showing with 21 additions and 19 deletions.
  1. BIN bin/reimp.exe
  2. +1 −1 bin/wxhaskell-register-template.bat
  3. +1 −1 bin/wxhaskell-unregister-template.bat
  4. +10 −9 configure
  5. +5 −4 makefile
  6. +4 −4 wxc/wxc.dsp
View
BIN bin/reimp.exe
Binary file not shown.
View
2 bin/wxhaskell-register-template.bat
@@ -64,4 +64,4 @@ ECHO.
GOTO end
:end
-PAUSE
+PAUSE
View
2 bin/wxhaskell-unregister-template.bat
@@ -42,4 +42,4 @@ ECHO.
GOTO end
:end
-PAUSE
+PAUSE
View
19 configure
@@ -8,7 +8,7 @@
# See license.txt for details.
#------------------------------------------------------------------------
-# $Id: configure,v 1.28 2004/02/12 06:41:49 dleijen Exp $
+# $Id: configure,v 1.29 2004/02/19 11:20:08 dleijen Exp $
#--------------------------------------------------------------------
# Variables
@@ -661,6 +661,13 @@ Package
}
EOF
+# set version in msc project file
+echo "update version number in visual c++ project file"
+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
+mv -f wxc/wxc.dsp.out wxc/wxc.dsp
+
+
+# create utility scripts
echo "creating utility scripts"
# generate compress utility
@@ -680,20 +687,14 @@ fi
# generate windows installer files.
echo " - config/wxhaskell-register.bat"
echo "@SET wxclibname=${wxclibname}-${version}" > config/wxhaskell-register-temp
-cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat > config/wxhaskell-register.bat
+cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat | sed -e "s|\$|\\r|g" > config/wxhaskell-register.bat
rm -f config/wxhaskell-register-temp
echo " - config/wxhaskell-unregister.bat"
echo "@SET wxclibname=${wxclibname}-${version}" > config/wxhaskell-unregister-temp
-cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat > config/wxhaskell-unregister.bat
+cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
rm -f config/wxhaskell-unregister-temp
-# take care of newline problems on windows
-if test "$toolkit"="msw"; then
- if sh ./config.search "unix2dos"; then
- unix2dos config/wxhaskell-register.bat config/wxhaskell-unregister.bat 1> /dev/null 2> /dev/null
- fi
-fi
# generate maxosx installer files.
echo " - config/macosx-install.info"
View
9 makefile
@@ -4,7 +4,7 @@
# See "license.txt" for more details.
#-----------------------------------------------------------------------
-# $Id: makefile,v 1.57 2004/02/12 08:38:16 dleijen Exp $
+# $Id: makefile,v 1.58 2004/02/19 11:20:09 dleijen Exp $
#--------------------------------------------------------------------------
# make [all] - build the libraries (in "lib").
@@ -683,6 +683,9 @@ $(WXCORE-CORE-OBJS) $(WXCORE-OBJS): $(WXCORE-IMPORTSDIR)/%.o: $(WXCORE-SRCDIR)/%
#--------------------------------------------------------------------------
# WXC: the C wrapper of the (C++) wxWindows API
+#
+# $(WXC-LIBNAME) is set in config/config.mk as it can be
+# either "wxc" or "wxcd" for a debug version.
#--------------------------------------------------------------------------
WXC =wxc
WXC-CPATH =ewxw
@@ -744,9 +747,7 @@ wxc-uninstall:
# dynamic link library on mingw32/cygwin: generates wxc.dll and a libwxc.a import library
ifeq ($(WITHMSC),yes)
-$(basename $(WXC-LIB)).dll: $(MSC-LIB)
- $(CP) $(MSC-LIB) $(WXC-LIB)
- $(CP) $(MSC-ARCHIVE) $(WXC-ARCHIVE)
+ # it must be generated already
else
$(basename $(WXC-LIB)).dll: $(WXC-OBJS)
$(CXX) -shared -o $@ $^ $(WXC-LIBS) -Wl,--output-def,$(WXC-OUTDIR)/$(WXC).def,--out-implib,$(WXC-ARCHIVE)
View
8 wxc/wxc.dsp
@@ -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" /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-0.5.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.lib move libwxc.a ..\out\wxc move wxc.def ..\out\wxc echo Done.
+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.
# 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.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-0.5.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.lib move libwxcd.a ..\out\wxc move wxcd.def ..\out\wxc echo Done.
+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.
# End Special Build Tool
!ENDIF

0 comments on commit 31db8ae

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