Don't log errors from GetScrollInfo since it is possible that there

[wxWidgets.git] / src / makesc.env

diff --git a/src/makesc.env b/src/makesc.env
index 813b2767c0ad9f89d5e5612b87c85067de4d2efb..dac29a2404cbfc69de0a58e400b1b016ae808396 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -3,7 +3,9 @@
 SC_SUFFIX=_sc
 
 ####WXDIR = $(WXWIN)
 SC_SUFFIX=_sc
 
 ####WXDIR = $(WXWIN)

+WXOUTDIR=$(WXDIR)\d_mars

 INCDIR = $(WXDIR)\include
 INCDIR = $(WXDIR)\include

+CONTRIBINCDIR = $(WXDIR)\contrib\include

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


@@ -15,7 +17,7 @@ SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX)
 SRCSUFF = cpp
 OBJSUFF = obj
 
 SRCSUFF = cpp
 OBJSUFF = obj
 

-INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
+INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(CONTRIBINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff

 
 
 
 
 
 


@@ -26,14 +28,18 @@ RC=rcc
 
 # WIN32 settings
 # -H ... fix to use directory
 
 # 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)
+##CFLAGS = -o -mn -W -H -D__NT__ -DWIN32 -D__WIN32__ -D__WIN95__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
+CFLAGS = -mn -D_WINDOWS -6 -a8 -Nc -c -H -HD$(WXOUTDIR) -HO- -DWXMSW -D__WIN32__ -D__WIN95__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
+CPPFLAGS = -cpp -Ae -Ar
+

 LINKER = link
 LINKER = link

+# possible bug with putting d on any extralibs if we have debug and release versions one day

 LDFLAGS = $(EXTRALDFLAGS)
 LIBS=$(WXLIB) $(EXTRALIBS) $(SUPPORTLIBS) 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 

-DEFFILE=sc32.def
+

 
 .$(SRCSUFF).obj:
 
 .$(SRCSUFF).obj:

-       *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) $< -o$@
+       *$(CC) -c $(CPPFLAGS) $(CFLAGS) $(INCLUDE) $(OPTIONS) $< -o$@

 
 # -Jm: relaxed type checking only for .C files
 .c.obj:
 
 # -Jm: relaxed type checking only for .C files
 .c.obj: