fixed off by one error in wxXPMDecoder::ReadFile

[wxWidgets.git] / distrib / msw / tmake / sc.t

diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index f79733cfd81cfaf59dc8982bd4856fec482aee63..ca6a04070573348e868d1cfbaf860b0dc970ba50 100644 (file)
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -37,8 +37,11 @@
 
         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 . " "
     }
 #$}
 
@@ -64,7 +67,6 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
-XPMDIR=$(WXDIR)\src\xpm
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
@@ -76,20 +78,8 @@ COMMONOBJS = \
 
 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)
 
@@ -112,3 +102,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 # $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
 #      *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
 
+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