X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78e376b56fe2716067010e355cbc5b49cab82002..25b1b442d63f3ff7ca4d007843b2d02f9137f801:/src/msw/makefile.g95?ds=sidebyside

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index d269f6c5a2..aebd230f38 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -6,7 +6,6 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 # Created:  1993
 # Updated:  1999
-# Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 #
@@ -21,11 +20,13 @@ include $(WXDIR)/src/makeg95.env
 
 # DLL Name, if building wxWindows as a DLL.
 ifdef WXMAKINGDLL
-WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).dll
+WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).dll
 WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def
-DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
-                 $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-	             $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
+DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libpng$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libregex$(MIN_SUFFIX).a
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
 ifeq ($(wxUSE_GUI),0)
@@ -52,11 +53,11 @@ OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 REGEXDIR= $(WXDIR)/src/regex
 
-ZLIBLIB = $(WXDIR)/lib/libzlib.a
-PNGLIB  = $(WXDIR)/lib/libpng.a
-JPEGLIB = $(WXDIR)/lib/libjpeg.a
-TIFFLIB = $(WXDIR)/lib/libtiff.a
-REGEXLIB= $(WXDIR)/lib/libregex.a
+ZLIBLIB = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a
+PNGLIB  = $(WXDIR)/lib/libpng$(MIN_SUFFIX).a
+JPEGLIB = $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a
+TIFFLIB = $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a
+REGEXLIB= $(WXDIR)/lib/libregex$(MIN_SUFFIX).a
 
 DOCDIR = $(WXDIR)/docs
 
@@ -91,11 +92,9 @@ GENERICOBJS = \
 		$(GENDIR)/numdlgg.$(OBJSUFF) \
 		$(GENDIR)/panelg.$(OBJSUFF) \
 		$(GENDIR)/progdlgg.$(OBJSUFF) \
-		$(GENDIR)/prop.$(OBJSUFF) \
-		$(GENDIR)/propform.$(OBJSUFF) \
-		$(GENDIR)/proplist.$(OBJSUFF) \
 		$(GENDIR)/sashwin.$(OBJSUFF) \
 		$(GENDIR)/scrlwing.$(OBJSUFF) \
+		$(GENDIR)/selstore.$(OBJSUFF) \
 		$(GENDIR)/spinctlg.$(OBJSUFF) \
 		$(GENDIR)/splash.$(OBJSUFF) \
 		$(GENDIR)/splitter.$(OBJSUFF) \
@@ -105,7 +104,6 @@ GENERICOBJS = \
 		$(GENDIR)/tipdlg.$(OBJSUFF) \
 		$(GENDIR)/tipwin.$(OBJSUFF) \
 		$(GENDIR)/treectlg.$(OBJSUFF) \
-		$(GENDIR)/treelay.$(OBJSUFF) \
 		$(GENDIR)/wizard.$(OBJSUFF)
 
 COMMONOBJS_BASE  = \
@@ -113,6 +111,7 @@ COMMONOBJS_BASE  = \
 		$(COMMDIR)/clntdata.$(OBJSUFF) \
 		$(COMMDIR)/cmdline.$(OBJSUFF) \
 		$(COMMDIR)/config.$(OBJSUFF) \
+		$(COMMDIR)/datacmn.$(OBJSUFF) \
 		$(COMMDIR)/datetime.$(OBJSUFF) \
 		$(COMMDIR)/datstrm.$(OBJSUFF) \
 		$(COMMDIR)/db.$(OBJSUFF) \
@@ -180,7 +179,7 @@ COMMONOBJS_BASEONLY  = \
 
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
-		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		$(COMMDIR)/accesscmn.$(OBJSUFF) \
 		$(COMMDIR)/artprov.$(OBJSUFF) \
 		$(COMMDIR)/artstd.$(OBJSUFF) \
 		$(COMMDIR)/choiccmn.$(OBJSUFF) \
@@ -198,9 +197,11 @@ COMMONOBJS  = \
 		$(COMMDIR)/dobjcmn.$(OBJSUFF) \
 		$(COMMDIR)/docmdi.$(OBJSUFF) \
 		$(COMMDIR)/docview.$(OBJSUFF) \
+		$(COMMDIR)/dpycmn.$(OBJSUFF) \
 		$(COMMDIR)/dseldlg.$(OBJSUFF) \
 		$(COMMDIR)/effects.$(OBJSUFF) \
 		$(COMMDIR)/fddlgcmn.$(OBJSUFF) \
+		$(COMMDIR)/fldlgcmn.$(OBJSUFF) \
 		$(COMMDIR)/fontcmn.$(OBJSUFF) \
 		$(COMMDIR)/framecmn.$(OBJSUFF) \
 		$(COMMDIR)/gaugecmn.$(OBJSUFF) \
@@ -231,10 +232,11 @@ COMMONOBJS  = \
 		$(COMMDIR)/prntbase.$(OBJSUFF) \
 		$(COMMDIR)/quantize.$(OBJSUFF) \
 		$(COMMDIR)/radiocmn.$(OBJSUFF) \
-		$(COMMDIR)/resource.$(OBJSUFF) \
+		$(COMMDIR)/rgncmn.$(OBJSUFF) \
 		$(COMMDIR)/settcmn.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/statbar.$(OBJSUFF) \
+		$(COMMDIR)/taskbarcmn.$(OBJSUFF) \
 		$(COMMDIR)/tbarbase.$(OBJSUFF) \
 		$(COMMDIR)/textcmn.$(OBJSUFF) \
 		$(COMMDIR)/toplvcmn.$(OBJSUFF) \
@@ -243,7 +245,6 @@ COMMONOBJS  = \
 		$(COMMDIR)/validate.$(OBJSUFF) \
 		$(COMMDIR)/valtext.$(OBJSUFF) \
 		$(COMMDIR)/wincmn.$(OBJSUFF) \
-		$(COMMDIR)/wxexpr.$(OBJSUFF) \
 		$(COMMDIR)/xpmdecod.$(OBJSUFF)
 
 HTMLOBJS = \
@@ -300,7 +301,6 @@ MSWOBJS     = \
 		$(MSWDIR)/colour.$(OBJSUFF) \
 		$(MSWDIR)/combobox.$(OBJSUFF) \
 		$(MSWDIR)/control.$(OBJSUFF) \
-		$(MSWDIR)/curico.$(OBJSUFF) \
 		$(MSWDIR)/cursor.$(OBJSUFF) \
 		$(MSWDIR)/data.$(OBJSUFF) \
 		$(MSWDIR)/dc.$(OBJSUFF) \
@@ -311,7 +311,7 @@ MSWOBJS     = \
 		$(MSWDIR)/dialog.$(OBJSUFF) \
 		$(MSWDIR)/dialup.$(OBJSUFF) \
 		$(MSWDIR)/dib.$(OBJSUFF) \
-		$(MSWDIR)/dibutils.$(OBJSUFF) \
+		$(MSWDIR)/display.$(OBJSUFF) \
 		$(MSWDIR)/dragimag.$(OBJSUFF) \
 		$(MSWDIR)/enhmeta.$(OBJSUFF) \
 		$(MSWDIR)/evtloop.$(OBJSUFF) \
@@ -373,6 +373,7 @@ MSWOBJS     = \
 		$(MSWDIR)/tooltip.$(OBJSUFF) \
 		$(MSWDIR)/toplevel.$(OBJSUFF) \
 		$(MSWDIR)/treectrl.$(OBJSUFF) \
+		$(MSWDIR)/uxtheme.$(OBJSUFF) \
 		$(MSWDIR)/wave.$(OBJSUFF) \
 		$(MSWDIR)/window.$(OBJSUFF)
 
@@ -380,7 +381,7 @@ ADVANCEDOBJS_BASE = \
 
 ADVANCEDOBJS     = \
                 $(ADVANCEDOBJS_BASE) \
-		$(COMMDIR)/odbc.$(OBJSUFF) \
+		$(MSWDIR)/ole/access.$(OBJSUFF) \
 		$(MSWDIR)/ole/automtn.$(OBJSUFF) \
 		$(MSWDIR)/ole/dataobj.$(OBJSUFF) \
 		$(MSWDIR)/ole/dropsrc.$(OBJSUFF) \
@@ -615,56 +616,15 @@ $(TIFFLIB): $(TIFFOBJS)
 	$(RANLIB) $@
 
 $(REGEXLIB):
-	$(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR) WXWIN=$(WXDIR)
+	$(MAKE) -C $(REGEXDIR) -f makefile.g95 MINGW32=$(MINGW32) WXDIR=$(WXDIR) WXWIN=$(WXDIR)
 
 $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
-$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
-	$(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -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
-
-$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.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
-# above.
-# $(COMMDIR)/lex_yy.c:	$(COMMDIR)/lexer.l
-#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-#
-# Try one of these if the above line doesn't work.
-# Alternative syntax (1)
-#	$(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
-# Alternative syntax (2)
-#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-#
-#	sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
-#	sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
-#       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
-#	rm -f lex.yy.c
-#
-# Replace yacc with bison if you run into compilation
-# problems with y_tab.c.
-#
-# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
-#	$(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
-#
-# If you use e.g. gcc on Unix, uncomment these lines
-# and comment out the above.
-#
-# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
-#	$(YACC) $(COMMDIR)/parser.y
-#	mv y.tab.c $(COMMDIR)/y_tab.c
-
 clean:
 	-$(RM) *.o
 	-$(RM) ole/*.o
 	-$(RM) *.bak
 	-$(RM) core
-	-$(RM) ../common/y_tab.c
-	-$(RM) ../common/lex_yy.c
 	-$(RM) ../common/*.o
 	-$(RM) ../common/*.bak
 	-$(RM) ../generic/*.o