diff options
| author | Romain Chantereay <rchantereau@entrouvert.com> | 2004-07-26 17:13:32 +0000 |
|---|---|---|
| committer | Romain Chantereay <rchantereau@entrouvert.com> | 2004-07-26 17:13:32 +0000 |
| commit | 432a237d31d25968f01f44e97e6d0f47fd9715b6 (patch) | |
| tree | 1604fe5c18e3b0660c1e12967d5a63c3efe25a99 /win32/Makefile.am | |
| parent | 8fb70e361af130048d00abc207eb5d262b9e0389 (diff) | |
| download | lasso-432a237d31d25968f01f44e97e6d0f47fd9715b6.tar.gz lasso-432a237d31d25968f01f44e97e6d0f47fd9715b6.tar.xz lasso-432a237d31d25968f01f44e97e6d0f47fd9715b6.zip | |
- Removed old style DLL exports definitions.
- Moved old to new way windows dll creation command.
Diffstat (limited to 'win32/Makefile.am')
| -rw-r--r-- | win32/Makefile.am | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/win32/Makefile.am b/win32/Makefile.am index b08bbfc3..7b640dba 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -4,25 +4,28 @@ EXTRA_DIST = create_lasso.def.py lasso.def lasso.rc dll: /usr/bin/windres -i lasso.rc -o lasso.rc.o - mkdir .libs - /usr/bin/dllwrap.exe --target=i386-mingw32 --def lasso.def \ - -o .libs/liblasso.dll -mno-cygwin --add-stdcall-alias \ - ../lasso/lasso.o lasso.rc.o \ - ../lasso/xml/.libs/liblasso-xml.al \ - ../lasso/protocols/.libs/liblasso-protocols.al \ - ../lasso/environs/.libs/liblasso-environs.al \ - -L/usr/local/lib -lglib-2.0 -lgobject-2.0 \ - -lxmlsec-openssl -lxmlsec \ - -lssl -lcrypto \ - -lxslt -lxml2 \ - -lpthread -lz -lm \ - --output-lib .libs/liblasso.a \ - --dllname liblasso.dll + mkdir -p .libs + gcc -mno-cygwin -shared -o .libs/lasso.dll \ + -Wl,--out-implib=.libs/lasso.a \ + -Wl,--add-stdcall-alias \ + -Wl,--export-all-symbols \ + lasso.rc.o \ + -Wl,--enable-auto-import \ + -Wl,--whole-archive \ + ../lasso/lasso.o \ + ../lasso/xml/.libs/liblasso-xml.al \ + ../lasso/protocols/.libs/liblasso-protocols.al \ + ../lasso/environs/.libs/liblasso-environs.al \ + -Wl,--no-whole-archive -L/usr/local/lib \ + -lgobject-2.0 -lglib-2.0 -lxmlsec-openssl -lxmlsec \ + -lssl -lcrypto \ + -lxslt -lxml2 \ + -lpthread -lz -lm install-dll: - cp -f .libs/liblasso.dll /usr/local/lib - cp -f .libs/liblasso.a /usr/local/lib + cp -f .libs/lasso.dll /usr/local/lib + cp -f .libs/lasso.a /usr/local/lib mkdir -p /usr/local/include/lasso cp -f ../lasso/*.h /usr/local/include/lasso mkdir -p /usr/local/include/lasso/environs |