diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-25 15:12:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-25 15:12:18 +0200 |
| commit | cb7834dd9f1b1816536a5ba419095c160f22a758 (patch) | |
| tree | 269b533562636ad2ef97af1ef89d0849647f519c | |
| parent | 9a867e32f89cdd115cdad9c25aeced6725886ee5 (diff) | |
| download | vcxsrv-cb7834dd9f1b1816536a5ba419095c160f22a758.tar.gz vcxsrv-cb7834dd9f1b1816536a5ba419095c160f22a758.tar.bz2 vcxsrv-cb7834dd9f1b1816536a5ba419095c160f22a758.zip | |
libXau is not compiled as dll
| -rw-r--r-- | libXau/libXau.def | 10 | ||||
| -rw-r--r-- | libXau/makefile | 2 | ||||
| -rw-r--r-- | makefile.after | 2 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 1 |
4 files changed, 13 insertions, 2 deletions
diff --git a/libXau/libXau.def b/libXau/libXau.def new file mode 100644 index 000000000..03762f509 --- /dev/null +++ b/libXau/libXau.def @@ -0,0 +1,10 @@ +LIBRARY libXau
+
+EXPORTS
+ XauDisposeAuth
+ XauGetBestAuthByAddr
+ XauReadAuth
+ XauWriteAuth
+ XauUnlockAuth
+ XauLockAuth
+ XauFileName
\ No newline at end of file diff --git a/libXau/makefile b/libXau/makefile index 0edc833b2..0840e2647 100644 --- a/libXau/makefile +++ b/libXau/makefile @@ -1,4 +1,4 @@ -LIBRARY = libXau +SHAREDLIB = libXau CSRCS = AuDispose.c \ AuFileName.c \ diff --git a/makefile.after b/makefile.after index 73f016cf9..cef71b839 100644 --- a/makefile.after +++ b/makefile.after @@ -29,7 +29,7 @@ LINKFLAGS += /DLL /DEF:$(DEFFILE) all: $(LIBRARYS)
-$(LIBRARYS) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS)
+$(LIBRARYS) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(DEFFILE)
$(LINK) $(LINKFLAGS) /OUT:$(relpath $(basename $@)).dll $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(OBJS)
endif
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 5cb2cb654..4286a9151 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -99,6 +99,7 @@ Section "VcXsrv (required)" File "..\dxtn.dll"
File "..\..\libxml2\bin\libxml2.dll"
File "..\..\zlib\obj\release\zlib1.dll"
+ File "..\..\libXau\obj\release\libXau.dll"
File "..\..\libxml2\bin\iconv.dll"
!ifndef VS2008
File "msvcr100.dll"
|