X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/059b646254357a0e6166002a08c7c3d0b54238dc..7f5f144a8143f02841ef9fa4662e25ef24038054:/src/makesc.env

diff --git a/src/makesc.env b/src/makesc.env
index d7919768af..1bf29f4b1a 100644
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -7,7 +7,9 @@ INCDIR = $(WXDIR)\include
 MSWINCDIR = $(WXDIR)\include\wx\msw
 ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
-WXLIB = $(LIBDIR)\wx$(SC_SUFFIX).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)
 
 SRCSUFF = cpp
 OBJSUFF = obj
@@ -21,19 +23,12 @@ INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDI
 CC=dmc
 RC=rcc
 
-# WIN16 settings
-#CFLAGS = -Jm -ml -W -D__WXMSW__ -D__SC__ -D__WXDEBUG__ -D__WINDOWS__ -D__WIN16__ $(EXTRACPPFLAGS)
-#LINKER = link
-#LDFLAGS = -ml -W -L$(LINKER).exe $(EXTRALDFLAGS)
-#LIBS=$(WXLIB) $(EXTRALIBS) libw.lib commdlg.lib ddeml.lib shell.lib # $(LIB)\ctl3dv2.lib
-#DEFFILE=sc16.def
-
 # WIN32 settings
 # -H ... fix to use directory
 CFLAGS = -o -mn -W -H -D__NT__ -DWIN32 -D__WIN32__ -D__WIN95__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
 LINKER = link
-LDFLAGS = /DELEXECUTABLE /RC $(EXTRALDFLAGS)
-LIBS=$(WXLIB) $(EXTRALIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid 
+LDFLAGS = $(EXTRALDFLAGS)
+LIBS=$(WXLIB) $(EXTRALIBS) $(SUPPORTLIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid $(WINSOCKLIB)
 DEFFILE=sc32.def
 
 .$(SRCSUFF).obj: