$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/;
+
$file =~ s/cp?p?$/obj/;
$project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
}
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 $wxGeneric{$file} =~ /\b16\b/;
+ next if $wxMSW{$file} =~ /\b16\b/;
+ my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
$file =~ s/cp?p?$/obj/;
- $project{"WXMSWOBJS"} .= '$(MSWDIR)\\' . $file . " "
+ $project{"WXMSWOBJS"} .= '$(MSWDIR)\\';
+ $project{"WXMSWOBJS"} .= 'ole\\' if $isOleObj;
+ $project{"WXMSWOBJS"} .= $file . " "
}
#$}
-# This file was automatically generated by tmake at #$ Now()
+# This file was automatically generated by tmake
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
-# Symantec C++ makefile for the msw objects
+# Digital mars makefile
+# was Symantec C++ makefile for the msw objects
+#
# called from src\makefile.sc
# 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=
GENDIR=$(WXDIR)\src\generic
COMMDIR=$(WXDIR)\src\common
-XPMDIR=$(WXDIR)\src\xpm
+HTMLDIR=$(WXDIR)\src\html
OLEDIR=ole
MSWDIR=$(WXDIR)\src\msw
GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
-COMMONOBJS = \
- $(COMMDIR)\y_tab.obj \
- #$ ExpandList("WXCOMMONOBJS");
+COMMONOBJS = #$ ExpandList("WXCOMMONOBJS");
-MSWOBJS = #$ ExpandList("WXMSWOBJS");
+HTMLOBJS = #$ ExpandList ("WXHTMLOBJS");
-XPMOBJECTS = $(XPMDIR)\crbuffri.obj\
- $(XPMDIR)\crdatfri.obj\
- $(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\
- $(XPMDIR)\crifrdat.obj\
- $(XPMDIR)\data.obj\
- $(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\
- $(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\
- $(XPMDIR)\rdftoi.obj\
- $(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\
- $(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\
- $(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj
+MSWOBJS = #$ ExpandList("WXMSWOBJS");
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+
+all: MAKEARCHDIR MAKELIBS PCH $(LIBTARGET) zlib png jpeg tiff regex
-all: $(LIBTARGET)
+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
+ @if not exist $(WXOUTDIR)\nul mkdir $(WXOUTDIR)
+
+#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_pch
+
+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)
+
+PCH: $(INCDIR)\wx\wxprec.h
+ dmc $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -HF$(WXOUTDIR)\wxprec.SYM -o$(WXOUTDIR)\wxprec.PCO $(INCDIR)\wx\wxprec.h
+
+clean_pch:
+ del $(WXOUTDIR)\*.sym
+ del $(WXOUTDIR)\*.PCO
+
+
+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
- cd $(WXWIN)\distrib\msw\tmake
- tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
- copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+ perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc
+ copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw
projects / wxWidgets.git / blobdiff