Fixed wxFileDialog and VC++ DLL compilation

[wxWidgets.git] / src / msw / makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 3428239c56195fd22c4340d566ddae4c051229f8..4cd5a40d0eb75df919111da52294031fba2efa93 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -29,8 +29,6 @@ include $(WXDIR)/src/makeg95.env
 #               USE_GAUGE should be 1
 #   xpm:      XPM pixmap support
 #               USE_XPM_IN_X should be 1
 #               USE_GAUGE should be 1
 #   xpm:      XPM pixmap support
 #               USE_XPM_IN_X should be 1

-#   image:    GIF, BMP image reading
-#               USE_IMAGE_LOADING_IN_X should be 1

 #   wxstring: string class
 #               USE_GNU_WXSTRING should be 1
 #
 #   wxstring: string class
 #               USE_GNU_WXSTRING should be 1
 #


@@ -49,6 +47,7 @@ EXTRAOBJS=
 
 GENDIR=../generic
 COMMDIR=../common
 
 GENDIR=../generic
 COMMDIR=../common

+XPMDIR=../xpm

 OLEDIR=ole
 MSWDIR=.
 
 OLEDIR=ole
 MSWDIR=.
 


@@ -61,15 +60,13 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \
 
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \

-  $(GENDIR)/colrdlgg.$(OBJSUFF) \
-  $(GENDIR)/fontdlgg.$(OBJSUFF) \
+  $(GENDIR)/dirdlgg.$(OBJSUFF) \

   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \

-  $(GENDIR)/helpxlp.$(OBJSUFF) \

   $(GENDIR)/laywin.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \

-  $(GENDIR)/msgdlgg.$(OBJSUFF) \

   $(GENDIR)/panelg.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \

-  $(GENDIR)/printps.$(OBJSUFF) \
-  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+  $(GENDIR)/prop.$(OBJSUFF) \
+  $(GENDIR)/propform.$(OBJSUFF) \
+  $(GENDIR)/proplist.$(OBJSUFF) \

   $(GENDIR)/sashwin.$(OBJSUFF) \
   $(GENDIR)/scrolwin.$(OBJSUFF) \
   $(GENDIR)/splitter.$(OBJSUFF) \
   $(GENDIR)/sashwin.$(OBJSUFF) \
   $(GENDIR)/scrolwin.$(OBJSUFF) \
   $(GENDIR)/splitter.$(OBJSUFF) \


@@ -77,6 +74,12 @@ GENERICOBJS= \
   $(GENDIR)/tabg.$(OBJSUFF) \
   $(GENDIR)/textdlgg.$(OBJSUFF)
 
   $(GENDIR)/tabg.$(OBJSUFF) \
   $(GENDIR)/textdlgg.$(OBJSUFF)
 

+#  $(GENDIR)/colrdlgg.$(OBJSUFF) \
+#  $(GENDIR)/fontdlgg.$(OBJSUFF) \
+#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+#  $(GENDIR)/printps.$(OBJSUFF) \
+#  $(GENDIR)/msgdlgg.$(OBJSUFF) \
+

 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \
 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \


@@ -90,14 +93,15 @@ COMMONOBJS = \
   $(COMMDIR)/framecmn.$(OBJSUFF) \
   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \
   $(COMMDIR)/framecmn.$(OBJSUFF) \
   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \

+  $(COMMDIR)/image.$(OBJSUFF) \

   $(COMMDIR)/intl.$(OBJSUFF) \
   $(COMMDIR)/layout.$(OBJSUFF) \
   $(COMMDIR)/log.$(OBJSUFF) \
   $(COMMDIR)/memory.$(OBJSUFF) \
   $(COMMDIR)/module.$(OBJSUFF) \
   $(COMMDIR)/intl.$(OBJSUFF) \
   $(COMMDIR)/layout.$(OBJSUFF) \
   $(COMMDIR)/log.$(OBJSUFF) \
   $(COMMDIR)/memory.$(OBJSUFF) \
   $(COMMDIR)/module.$(OBJSUFF) \

+  $(COMMDIR)/mimetype.$(OBJSUFF) \

   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/odbc.$(OBJSUFF) \
   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/odbc.$(OBJSUFF) \

-  $(COMMDIR)/postscrp.$(OBJSUFF) \

   $(COMMDIR)/process.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \
   $(COMMDIR)/process.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \


@@ -118,7 +122,7 @@ COMMONOBJS = \
   $(COMMDIR)/tokenzr.$(OBJSUFF) \
   $(COMMDIR)/y_tab.$(OBJSUFF) \
   $(COMMDIR)/stream.$(OBJSUFF) \
   $(COMMDIR)/tokenzr.$(OBJSUFF) \
   $(COMMDIR)/y_tab.$(OBJSUFF) \
   $(COMMDIR)/stream.$(OBJSUFF) \

-  $(COMMDIR)/fstream.$(OBJSUFF) \
+  $(COMMDIR)/wfstream.$(OBJSUFF) \

   $(COMMDIR)/mstream.$(OBJSUFF) \
   $(COMMDIR)/zstream.$(OBJSUFF) \
   $(COMMDIR)/datstrm.$(OBJSUFF) \
   $(COMMDIR)/mstream.$(OBJSUFF) \
   $(COMMDIR)/zstream.$(OBJSUFF) \
   $(COMMDIR)/datstrm.$(OBJSUFF) \


@@ -126,8 +130,11 @@ COMMONOBJS = \
   $(COMMDIR)/extended.$(OBJSUFF) \
   $(COMMDIR)/wincmn.$(OBJSUFF)
 
   $(COMMDIR)/extended.$(OBJSUFF) \
   $(COMMDIR)/wincmn.$(OBJSUFF)
 

-# Unfortunately, GnuWin32 fails with a syntax error in Sockets.h,
-# so remove socket code.
+#  $(COMMDIR)/postscrp.$(OBJSUFF) \
+
+# NOTE: if the socket-related files fail with a syntax error in Sockets.h,
+# remove the files (probably all GnuWin32 releases < b20). Cygwin b20 is OK,
+# Mingw32 may still have problems.

 #  $(COMMDIR)/socket.$(OBJSUFF) \
 #  $(COMMDIR)/sckaddr.$(OBJSUFF) \
 #  $(COMMDIR)/sckfile.$(OBJSUFF) \
 #  $(COMMDIR)/socket.$(OBJSUFF) \
 #  $(COMMDIR)/sckaddr.$(OBJSUFF) \
 #  $(COMMDIR)/sckfile.$(OBJSUFF) \


@@ -164,7 +171,6 @@ MSWOBJS = \
   dde.$(OBJSUFF) \
   dialog.$(OBJSUFF) \
   dib.$(OBJSUFF) \
   dde.$(OBJSUFF) \
   dialog.$(OBJSUFF) \
   dib.$(OBJSUFF) \

-  dirdlg.$(OBJSUFF) \

   filedlg.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
   filedlg.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \


@@ -218,16 +224,33 @@ MSWOBJS = \
   utils.$(OBJSUFF) \
   utilsexc.$(OBJSUFF) \
   wave.$(OBJSUFF) \
   utils.$(OBJSUFF) \
   utilsexc.$(OBJSUFF) \
   wave.$(OBJSUFF) \

-  window.$(OBJSUFF)
+  window.$(OBJSUFF) \
+  xpmhand.$(OBJSUFF)

 
 

-# OLE not supported yet by GnuWin32 (?)
+# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
+#  dirdlg.$(OBJSUFF) \
+
+# OLE not supported yet by GnuWin32

 #  $(OLEDIR)/droptgt.$(OBJSUFF) \
 #  $(OLEDIR)/dropsrc.$(OBJSUFF) \
 #  $(OLEDIR)/dataobj.$(OBJSUFF) \
 #  $(OLEDIR)/oleutils.$(OBJSUFF) \
 #  $(OLEDIR)/droptgt.$(OBJSUFF) \
 #  $(OLEDIR)/dropsrc.$(OBJSUFF) \
 #  $(OLEDIR)/dataobj.$(OBJSUFF) \
 #  $(OLEDIR)/oleutils.$(OBJSUFF) \

-#  $(OLEDIR)/uuid.$(OBJSUFF)
-
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS)
+#  $(OLEDIR)/uuid.$(OBJSUFF) \
+#  $(OLEDIR)/automtn.$(OBJSUFF)
+
+XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
+               $(XPMDIR)/crdatfri.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)/rdftoi.o\
+               $(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
+               $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
+               $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS)

 
 all:    $(OBJECTS) $(WXLIB)
 
 
 all:    $(OBJECTS) $(WXLIB)
 


@@ -258,7 +281,10 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
 $(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
 $(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l

-       $(LEX) -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+       $(LEX) $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+
+# The following may be required for some versions of LEX/FLEX
+#      $(LEX) -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/BUFSIZ/5000/g" < lex.yy.c | \
 #      sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \


@@ -267,11 +293,16 @@ $(COMMDIR)/lex_yy.c:      $(COMMDIR)/lexer.l
 
 # Replace yacc with bison if you run into compilation
 # problems with y_tab.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
 
 $(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
        $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
 

-#      mv y.tab.c $(COMMDIR)/y_tab.c
+# 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

 
 # Extra targets
 rcparser:
 
 # Extra targets
 rcparser: