don't report setlocale failure if trying to set Unicode-only language

[wxWidgets.git] / src / makesc.env

diff --git a/src/makesc.env b/src/makesc.env
index 2237f97a556a4e96b53528949996079f429dbeb2..064e1cbf0274693d134a4541d892b34b6d3764ed 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -16,17 +16,18 @@ CC=sc
 RC=rc
 
 # WIN16 settings
 RC=rc
 
 # WIN16 settings

-#CFLAGS = -Jm -ml -W -D__WXMSW__ -D__WXDEBUG__ -D__WINDOWS__ -D__WIN16__ $(EXTRACPPFLAGS)
-#LDFLAGS = -ml -W
+#CFLAGS = -Jm -ml -W -D__WXMSW__ -D__SC__ -D__WXDEBUG__ -D__WINDOWS__ -D__WIN16__ $(EXTRACPPFLAGS)

 #LINKER = link
 #LINKER = link

-#LIBS=$(WXLIB) $(EXTRALIBS) libw.lib commdlg.lib ddeml.lib shell.lib
+#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)
 #DEFFILE=sc16.def
 
 # WIN32 settings
 CFLAGS = -o -mn -W -D__NT__ -DWIN32 -D__WIN32__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)

-LDFLAGS = -Llink386.exe $(EXTRALDFLAGS)

 LINKER = link386
 LINKER = link386

+LDFLAGS = -L$(LINKER).exe $(EXTRALDFLAGS)

 LIBS=$(WXLIB) $(EXTRALIBS) ctl3d32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib kernel32.lib winmm.lib
 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) $< -o$@
 
 .$(SRCSUFF).obj:
        *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $< -o$@