allow untranslated accelerators, too

[wxWidgets.git] / src / msw / makefile.sc

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 72035afc13f3a1839470e3fe1610e0a6afeb729a..f82064a06fb32e2d132f8fbeca16c405264c87d7 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -8,13 +8,13 @@
 
 # configuration section (see src\makefile.sc) ###########################
 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 
 include ..\makesc.env
 
 DEBUG=0
 
-LIBTARGET = $(LIBDIR)\wx.lib
+LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
 
 OPTIONS=
 
@@ -22,6 +22,7 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
+HTMLDIR=$(WXDIR)\src\html
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
@@ -53,9 +54,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\treectlg.obj \
                $(GENDIR)\wizard.obj
 
-COMMONOBJS = \
-               $(COMMDIR)\y_tab.obj \
-               $(COMMDIR)\accesscmn.obj \
+COMMONOBJS = $(COMMDIR)\accesscmn.obj \
                $(COMMDIR)\appcmn.obj \
                $(COMMDIR)\artprov.obj \
                $(COMMDIR)\artstd.obj \
@@ -188,6 +187,27 @@ COMMONOBJS = \
                $(COMMDIR)\zipstrm.obj \
                $(COMMDIR)\zstream.obj
 
+HTMLOBJS = $(HTMLDIR)\helpctrl.obj \
+               $(HTMLDIR)\helpdata.obj \
+               $(HTMLDIR)\helpfrm.obj \
+               $(HTMLDIR)\htmlcell.obj \
+               $(HTMLDIR)\htmlfilt.obj \
+               $(HTMLDIR)\htmlpars.obj \
+               $(HTMLDIR)\htmltag.obj \
+               $(HTMLDIR)\htmlwin.obj \
+               $(HTMLDIR)\htmprint.obj \
+               $(HTMLDIR)\m_dflist.obj \
+               $(HTMLDIR)\m_fonts.obj \
+               $(HTMLDIR)\m_hline.obj \
+               $(HTMLDIR)\m_image.obj \
+               $(HTMLDIR)\m_layout.obj \
+               $(HTMLDIR)\m_links.obj \
+               $(HTMLDIR)\m_list.obj \
+               $(HTMLDIR)\m_pre.obj \
+               $(HTMLDIR)\m_style.obj \
+               $(HTMLDIR)\m_tables.obj \
+               $(HTMLDIR)\winpars.obj
+
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\ole\access.obj \
                $(MSWDIR)\app.obj \
@@ -242,8 +262,11 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\helpchm.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
+               $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\iniconf.obj \
+               $(MSWDIR)\joystick.obj \
                $(MSWDIR)\listbox.obj \
+               $(MSWDIR)\listctrl.obj \
                $(MSWDIR)\main.obj \
                $(MSWDIR)\mdi.obj \
                $(MSWDIR)\menu.obj \
@@ -254,6 +277,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\msgdlg.obj \
                $(MSWDIR)\mslu.obj \
                $(MSWDIR)\nativdlg.obj \
+               $(MSWDIR)\notebook.obj \
                $(MSWDIR)\ole\oleutils.obj \
                $(MSWDIR)\ownerdrw.obj \
                $(MSWDIR)\palette.obj \
@@ -270,7 +294,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\scrolbar.obj \
                $(MSWDIR)\settings.obj \
                $(MSWDIR)\slider95.obj \
-               $(MSWDIR)\slidrmsw.obj \
                $(MSWDIR)\snglinst.obj \
                $(MSWDIR)\spinbutt.obj \
                $(MSWDIR)\spinctrl.obj \
@@ -282,7 +305,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\tabctrl.obj \
                $(MSWDIR)\taskbar.obj \
                $(MSWDIR)\tbar95.obj \
-               $(MSWDIR)\tbarmsw.obj \
                $(MSWDIR)\textctrl.obj \
                $(MSWDIR)\tglbtn.obj \
                $(MSWDIR)\thread.obj \
@@ -298,28 +320,66 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\window.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 
+
+all: MAKEARCHDIR MAKELIBS $(LIBTARGET) zlib png jpeg tiff regex
+
+MAKEARCHDIR:
+    @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h
+    @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)
+    @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)\wx
+    @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
 
-all: $(LIBTARGET)
+#build our own copies of missing libraries
+MAKELIBS:
+      implib  /s $(LIBDIR)\$(SHELLLIB) $(LIBDIR)\$(SC_SUFFIX)\$(SHELLLIB).def
+      implib  /s $(LIBDIR)\$(WINSOCKLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINSOCKLIB).def
 
 $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
        *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
 
-clean:
+clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex
+
+clean_msw:
+       -del $(COMMDIR)\*.obj
+       -del $(MSWDIR)\*.obj
+       -del $(GENDIR)\*.obj
+        -del $(HTMLDIR)\*.obj
        -del *.obj
-    -del $(LIBTARGET)
+       -del *.sym
+        -del ole\*.obj
+        -del $(LIBTARGET)
+
+png:   
+        make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
+
+clean_png:
+        make -f $(WXDIR)\src\png\makefile.sc clean
+
+zlib:   
+        make -f $(WXDIR)\src\zlib\makefile.sc FINAL=$(FINAL) 
+
+clean_zlib:
+        make -f $(WXDIR)\src\zlib\makefile.sc clean
+
+jpeg:   
+        make -f $(WXDIR)\src\jpeg\makefile.sc FINAL=$(FINAL)
+
+clean_jpeg:
+        make -f $(WXDIR)\src\jpeg\makefile.sc clean
 
-$(COMMDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+regex:  
+        make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) 
 
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+clean_regex:
+        make -f $(WXDIR)\src\regex\makefile.sc clean
 
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+tiff:  
+        make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) 
 
-# $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
-#      *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
+clean_tiff:
+        make -f $(WXDIR)\src\tiff\makefile.sc clean
 
 MFTYPE=sc
 makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t