diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-08 11:47:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-08 11:47:30 +0100 |
| commit | c8483dc2831dc37d93a36804022f6b064f5962ea (patch) | |
| tree | 599f145a848e10b75a1a8c314ed9c51031446506 /makefile.before | |
| parent | c97d11aec40d8fa07d6b456bf8694133a77d35f4 (diff) | |
| download | vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.gz vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.bz2 vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.zip | |
Solved compilation and link problems after last merge
Diffstat (limited to 'makefile.before')
| -rw-r--r-- | makefile.before | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makefile.before b/makefile.before index 6217b38ad..5d7ca04e9 100644 --- a/makefile.before +++ b/makefile.before @@ -79,8 +79,8 @@ TOPSRCDIR=$(MHMAKECONF)\xorg-server INCLUDES += . $(MHMAKECONF)\openssl\inc32 $(MHMAKECONF) $(MHMAKECONF)\pixman-1 $(MHMAKECONF)\pthreads
INCLUDES += $(TOPSRCDIR)\include $(TOPSRCDIR)\mi $(TOPSRCDIR)\mfb $(TOPSRCDIR)\hw\xfree86\common $(TOPSRCDIR)\render $(TOPSRCDIR)\miext\damage
INCLUDES += $(TOPSRCDIR)\damageext $(TOPSRCDIR)\randr $(TOPSRCDIR)\xfixes $(TOPSRCDIR)\Xi $(TOPSRCDIR)\fb $(TOPSRCDIR)\miext\cw
-INCLUDES += $(TOPSRCDIR)\miext\shadow $(MHMAKECONF)\zlib
-INCLUDES += $(MHMAKECONF)\include $(TOPSRCDIR)\Xext $(MHMAKECONF)\pixman\pixman
+INCLUDES += $(TOPSRCDIR)\miext\shadow $(TOPSRCDIR)\miext\sync $(MHMAKECONF)\zlib
+INCLUDES += $(MHMAKECONF)\include $(TOPSRCDIR)\Xext $(MHMAKECONF)\pixman\pixman $(TOPSRCDIR)\present
SYSTEMLIBS ?= odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib shlwapi.lib \
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setupapi.lib winmm.lib ws2_32.lib wmcodecdspuuid.lib comctl32.lib opengl32.lib
|