update from liou xiao <liouxiao@hotmail.com>

[wxWidgets.git] / src / makesc.env

diff --git a/src/makesc.env b/src/makesc.env
index d7919768af08da2e8972e777602b5203941fdb31..0f689b73a8f3ed606ac702d058e579897f8b64f2 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -2,17 +2,23 @@
 # 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)
+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

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

 
 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

 
 
 
 
 
 


@@ -21,25 +27,22 @@ INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDI
 CC=dmc
 RC=rcc
 
 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
 # 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

-LDFLAGS = /DELEXECUTABLE /RC $(EXTRALDFLAGS)
-LIBS=$(WXLIB) $(EXTRALIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid 
-DEFFILE=sc32.def
+# 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 
+

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

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

 
 

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

 .c.obj:
        *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
 
 .c.obj:
        *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@