From 0caac3b4a99284985f3b47dc4942fa77cf9b4f43 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Tue, 22 Apr 2003 21:02:29 +0000 Subject: [PATCH] update to make digitalmars compile/link image sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/sc.t | 68 +++++++++++++++++++++++++--------- samples/image/makefile.sc | 4 ++ src/msw/makefile.sc | 78 +++++++++++++++++++++++++++++++-------- src/msw/mdi.cpp | 5 ++- 4 files changed, 121 insertions(+), 34 deletions(-) create mode 100644 samples/image/makefile.sc diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t index b3a6730f1a..3c18534307 100644 --- a/distrib/msw/tmake/sc.t +++ b/distrib/msw/tmake/sc.t @@ -26,6 +26,13 @@ $project{$tag} .= '$(GENDIR)\\' . $file . " " } + foreach $file (sort keys %wxHTML) { + next if $wxHTML{$file} =~ /\b16\b/; + + $file =~ s/cp?p?$/obj/; + $project{"WXHTMLOBJS"} .= '$(HTMLDIR)\\' . $file . " " + } + foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\b(16|U)\b/; @@ -35,7 +42,7 @@ foreach $file (sort keys %wxMSW) { #! these files don't compile with SC++ 6 - next if $file =~ /^(joystick|pnghand)\./; + #! next if $file =~ /^(joystick|pnghand)\./; next if $wxMSW{$file} =~ /\b16\b/; @@ -69,21 +76,22 @@ OPTIONS= GENDIR=$(WXDIR)\src\generic COMMDIR=$(WXDIR)\src\common +HTMLDIR=$(WXDIR)\src\html OLEDIR=ole MSWDIR=$(WXDIR)\src\msw GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); -COMMONOBJS = \ - $(COMMDIR)\y_tab.obj \ - #$ ExpandList("WXCOMMONOBJS"); +COMMONOBJS = #$ ExpandList("WXCOMMONOBJS"); + +HTMLOBJS = #$ ExpandList ("WXHTMLOBJS"); MSWOBJS = #$ ExpandList("WXMSWOBJS"); # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) +OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) $(WINSOCKLIB) -all: MAKEARCHDIR $(LIBTARGET) +all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex MAKEARCHDIR: @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h @@ -91,27 +99,53 @@ MAKEARCHDIR: @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 +MAKEWINSOCKLIB: + @if not exist $(WINSOCKLIB) implib /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll +## implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll +## implib /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll +##@if not exist $(WINSOCKLIB) + $(LIBTARGET): $(OBJECTS) -del $(LIBTARGET) *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul; -clean: +clean: clean_zlib clean_png clean_jpeg clean_tiff clean_regex -del $(COMMDIR)\*.obj -del $(MSWDIR)\*.obj -del $(GENDIR)\*.obj + -del $(HTMLDIR)\*.obj -del *.obj -del $(LIBTARGET) -## $(COMMDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c -## -## $(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c -## copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c -## -## $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c -## copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c -## -### $(COMMDIR)\cmndata.obj: $(COMMDIR)\cmndata.cpp -### *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj +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 + +regex: + make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) + +clean_regex: + make -f $(WXDIR)\src\regex\makefile.sc clean + +tiff: + make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) + +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 diff --git a/samples/image/makefile.sc b/samples/image/makefile.sc new file mode 100644 index 0000000000..bc3b957152 --- /dev/null +++ b/samples/image/makefile.sc @@ -0,0 +1,4 @@ +# Symantec C++ makefile +WXDIR = $(WXWIN) +TARGET=image +include $(WXDIR)\src\makeprog.sc diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 37a26a971e..798f7a323b 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -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 \ @@ -244,6 +264,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\icon.obj \ $(MSWDIR)\imaglist.obj \ $(MSWDIR)\iniconf.obj \ + $(MSWDIR)\joystick.obj \ $(MSWDIR)\listbox.obj \ $(MSWDIR)\listctrl.obj \ $(MSWDIR)\main.obj \ @@ -299,9 +320,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\window.obj # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) +OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) $(WINSOCKLIB) -all: MAKEARCHDIR $(LIBTARGET) +all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex MAKEARCHDIR: @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h @@ -309,27 +330,52 @@ MAKEARCHDIR: @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 +MAKEWINSOCKLIB: + implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll +## implib /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll +##@if not exist $(WINSOCKLIB) + $(LIBTARGET): $(OBJECTS) -del $(LIBTARGET) *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul; -clean: +clean: clean_zlib clean_png clean_jpeg clean_tiff clean_regex -del $(COMMDIR)\*.obj -del $(MSWDIR)\*.obj -del $(GENDIR)\*.obj + -del $(HTMLDIR)\*.obj -del *.obj -del $(LIBTARGET) -## $(COMMDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c -## -## $(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c -## copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c -## -## $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c -## copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c -## -### $(COMMDIR)\cmndata.obj: $(COMMDIR)\cmndata.cpp -### *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj +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 + +regex: + make -f $(WXDIR)\src\regex\makefile.sc FINAL=$(FINAL) + +clean_regex: + make -f $(WXDIR)\src\regex\makefile.sc clean + +tiff: + make -f $(WXDIR)\src\tiff\makefile.sc FINAL=$(FINAL) + +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 diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 92b2fde323..d2df50dda8 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -68,8 +68,11 @@ extern wxMenu *wxCurrentPopupMenu; extern const wxChar *wxMDIFrameClassName; // from app.cpp extern const wxChar *wxMDIChildFrameClassName; extern const wxChar *wxMDIChildFrameClassNameNoRedraw; - +#ifdef __DIGITALMARS__ +extern "C" void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); +#else extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); +#endif extern void wxRemoveHandleAssociation(wxWindow *win); static HWND invalidHandle = 0; -- 2.45.2