Ok() should be called on image, not bitmap

[wxWidgets.git] / src / makesc.env

diff --git a/src/makesc.env b/src/makesc.env
index c10cc56f390278519b1a2db5b3c16577f1a9b19e..064e1cbf0274693d134a4541d892b34b6d3764ed 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -2,19 +2,40 @@
 
 WXDIR = $(WXWIN)
 INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
+LIBDIR = $(WXDIR)\lib
+WXLIB = $(LIBDIR)\wx.lib
 
 SRCSUFF = cpp
 OBJSUFF = obj
 
+INCLUDE=$(INCDIR)
+
 # default values
 
 CC=sc
 RC=rc
-CFLAGS = -o -ml -W -D__WINDOWS__
-LDFLAGS = -ml -W
+
+# 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
+CFLAGS = -o -mn -W -D__NT__ -DWIN32 -D__WIN32__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
+LINKER = link386
+LDFLAGS = -L$(LINKER).exe $(EXTRALDFLAGS)
+LIBS=$(WXLIB) $(EXTRALIBS) ctl3d32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib kernel32.lib winmm.lib
+DEFFILE=sc32.def
 
 .$(SRCSUFF).obj:
-       *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $<
+       *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $< -o$@
+
+# -Jm: relaxed type checking
+.c.obj:
+       *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
+
+.rc.res:
+       *$(RC) -r -I$(INCLUDE) $<