Compilation fix.

[wxWidgets.git] / src / makesc.env

diff --git a/src/makesc.env b/src/makesc.env
index 1bf29f4b1a412e2eaf7c38993bf3e0722d42322b..11c7bbe7363d01c3d524d555e1d87f034ec219ac 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -2,14 +2,15 @@
 # and digital mars successor (http://www.digitalmars.com)
 SC_SUFFIX=_sc
 
 # and digital mars successor (http://www.digitalmars.com)
 SC_SUFFIX=_sc
 

-WXDIR = $(WXWIN)
+####WXDIR = $(WXWIN)

 INCDIR = $(WXDIR)\include
 MSWINCDIR = $(WXDIR)\include\wx\msw
 ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
 WXLIB = wx$(SC_SUFFIX).lib
 INCDIR = $(WXDIR)\include
 MSWINCDIR = $(WXDIR)\include\wx\msw
 ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
 WXLIB = wx$(SC_SUFFIX).lib

-WINSOCKLIB = $(LIBDIR)\winsock$(SC_SUFFIX).lib
-SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX)
+WINSOCKLIB = wsock32$(SC_SUFFIX)
+SHELLLIB = shell32$(SC_SUFFIX)
+SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX) $(SHELLLIB) $(WINSOCKLIB)

 
 SRCSUFF = cpp
 OBJSUFF = obj
 
 SRCSUFF = cpp
 OBJSUFF = obj


@@ -28,7 +29,7 @@ RC=rcc
 CFLAGS = -o -mn -W -H -D__NT__ -DWIN32 -D__WIN32__ -D__WIN95__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
 LINKER = link
 LDFLAGS = $(EXTRALDFLAGS)
 CFLAGS = -o -mn -W -H -D__NT__ -DWIN32 -D__WIN32__ -D__WIN95__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
 LINKER = link
 LDFLAGS = $(EXTRALDFLAGS)

-LIBS=$(WXLIB) $(EXTRALIBS) $(SUPPORTLIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid $(WINSOCKLIB)
+LIBS=$(WXLIB) $(EXTRALIBS) $(SUPPORTLIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid 

 DEFFILE=sc32.def
 
 .$(SRCSUFF).obj:
 DEFFILE=sc32.def
 
 .$(SRCSUFF).obj: