From: Guillermo Rodriguez Garcia <guille@iies.es>
Date: Tue, 1 Feb 2000 18:13:20 +0000 (+0000)
Subject: Updated for new XPM files
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9b97ee33d73653216512fd634a27b6135191ece9?hp=bfef20bf7d4d58cf31ea70fd6eb7404bee864939

Updated for new XPM files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/makeg95.env b/src/makeg95.env
index ace66917c3..390f8bb931 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -28,7 +28,7 @@ LD_SUPPORTS_SHARED=yes
 RM=rm -f 
 
 # Set to the appropriate copy command
-COPY=cp
+COPY=copy
 
 # Cross compiling? Provide the target prefix (eg., i386-mingw32-)
 # CROSS=i386-mingw32-
@@ -209,10 +209,11 @@ LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS)
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
 
-.$(SRCSUFF).$(OBJSUFF):
-	$(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
 
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $*.c
 
+.$(SRCSUFF).$(OBJSUFF):
+	$(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
+
 
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 85cb4710ba..c67555500b 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -86,6 +86,7 @@ GENERICOBJS = \
 		$(GENDIR)/scrolwin.$(OBJSUFF) \
 		$(GENDIR)/splitter.$(OBJSUFF) \
 		$(GENDIR)/statusbr.$(OBJSUFF) \
+        $(GENDIR)/tabg.$(OBJSUFF) \
 		$(GENDIR)/tbarsmpl.$(OBJSUFF) \
 		$(GENDIR)/textdlgg.$(OBJSUFF) \
 		$(GENDIR)/tipdlg.$(OBJSUFF) \
@@ -395,17 +396,25 @@ JPEGOBJS    = \
 		$(JPEGDIR)/jquant2.$(OBJSUFF) \
 		$(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJS =    $(XPMDIR)/crbuffri.o\
+XPMOBJS =    $(XPMDIR)/attrib.o\
+		$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/crdatfri.o\
-		$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+		$(XPMDIR)/create.o\
+		$(XPMDIR)/crifrbuf.o\
 		$(XPMDIR)/crifrdat.o\
 		$(XPMDIR)/data.o\
-		$(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
-		$(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+		$(XPMDIR)/image.o\
+		$(XPMDIR)/info.o\
+		$(XPMDIR)/hashtab.o\
+		$(XPMDIR)/misc.o\
+		$(XPMDIR)/parse.o\
+		$(XPMDIR)/rdftodat.o\
 		$(XPMDIR)/rdftoi.o\
-		$(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
-		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
-		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+		$(XPMDIR)/rgb.o\
+		$(XPMDIR)/scan.o\
+		$(XPMDIR)/simx.o\
+		$(XPMDIR)/wrffrdat.o\
+		$(XPMDIR)/wrffri.o
 
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
 		$(TIFFDIR)/tif_close.o \
@@ -535,10 +544,10 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
-	$(COPY) ../common/dosyacc.c ../common/y_tab.c
+	$(COPY) ..\common\dosyacc.c ..\common\y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-	$(COPY) ../common/doslex.c ../common/lex_yy.c
+	$(COPY) ..\common\doslex.c ..\common\lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER