X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4bf67638004fc798a2af681efd23d47a97df735..ed4eede6c2c16cdb422a39c1b3655956b8f51a1c:/src/makesc.env diff --git a/src/makesc.env b/src/makesc.env index 607d44e010..0f689b73a8 100644 --- a/src/makesc.env +++ b/src/makesc.env @@ -3,6 +3,7 @@ SC_SUFFIX=_sc ####WXDIR = $(WXWIN) +WXOUTDIR=$(WXDIR)\d_mars INCDIR = $(WXDIR)\include CONTRIBINCDIR = $(WXDIR)\contrib\include MSWINCDIR = $(WXDIR)\include\wx\msw @@ -11,7 +12,8 @@ LIBDIR = $(WXDIR)\lib WXLIB = wx$(SC_SUFFIX).lib WINSOCKLIB = wsock32$(SC_SUFFIX) SHELLLIB = shell32$(SC_SUFFIX) -SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX) $(SHELLLIB) $(WINSOCKLIB) +WINMMLIB =winmm32$(SC_SUFFIX) +SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX) $(SHELLLIB) $(WINSOCKLIB) $(WINMMLIB) SRCSUFF = cpp OBJSUFF = obj @@ -27,7 +29,10 @@ RC=rcc # 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 # possible bug with putting d on any extralibs if we have debug and release versions one day LDFLAGS = $(EXTRALDFLAGS) @@ -35,7 +40,7 @@ LIBS=$(WXLIB) $(EXTRALIBS) $(SUPPORTLIBS) advapi32 comctl32 comdlg32 ctl3d32 gc .$(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: