Cured some Latex problems; fixed i declaration; fixed filedlg.cpp

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 202b58d8a141cc784c482fe0ca7970484087f011..aee32cbfd7d9b492ec3a28c0d07b1e4adf0e2f2f 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -60,12 +60,9 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \
-  $(GENDIR)/colrdlgg.$(OBJSUFF) \
   $(GENDIR)/dirdlgg.$(OBJSUFF) \
-  $(GENDIR)/fontdlgg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \
-  $(GENDIR)/msgdlgg.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \
   $(GENDIR)/prop.$(OBJSUFF) \
   $(GENDIR)/propform.$(OBJSUFF) \
@@ -77,8 +74,11 @@ GENERICOBJS= \
   $(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) \
@@ -130,8 +130,6 @@ COMMONOBJS = \
   $(COMMDIR)/extended.$(OBJSUFF) \
   $(COMMDIR)/wincmn.$(OBJSUFF)
 
-#  $(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.
@@ -220,11 +218,13 @@ MSWOBJS = \
   textctrl.$(OBJSUFF) \
   thread.$(OBJSUFF) \
   timer.$(OBJSUFF) \
+  tooltip.$(OBJSUFF) \
   treectrl.$(OBJSUFF) \
   utils.$(OBJSUFF) \
   utilsexc.$(OBJSUFF) \
   wave.$(OBJSUFF) \
-  window.$(OBJSUFF)
+  window.$(OBJSUFF) \
+  xpmhand.$(OBJSUFF)
 
 # Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
 #  dirdlg.$(OBJSUFF) \
@@ -280,10 +280,13 @@ $(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
-       $(LEX) $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+       $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
 
-# The following may be required for some versions of LEX/FLEX
-#      $(LEX) -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" | \
@@ -292,11 +295,16 @@ $(COMMDIR)/lex_yy.c:      $(COMMDIR)/lexer.l
 
 # 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
 
-#      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: