}
foreach $file (sort keys %wxCommon) {
+ next if $wxCommon{$file} =~ /\b(16|U)\b/;
+
$file =~ s/cp?p?$/obj/;
$project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
}
next if $wxGeneric{$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
GENDIR=$(WXDIR)\src\generic
COMMDIR=$(WXDIR)\src\common
-XPMDIR=$(WXDIR)\src\xpm
OLEDIR=ole
MSWDIR=$(WXDIR)\src\msw
MSWOBJS = #$ ExpandList("WXMSWOBJS");
-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
-
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
all: $(LIBTARGET)