Fixes for smoother cross compilation;

- added parser.o to msw objects in unx.t
- made sure 'lexer.c' is included in parser.y when cross compiling wxMSW
- added optional program extention PROGRAM_EXT set by configure, so that
  makeprog.env can create .exe files
- a few additions to setup.h.in (wxUSE_OWNER_DRAWN for wxMSW, hack to fix
a clash with __WINDOWS__ define in wx/deps.h


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

Makefile.in

@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 13:41, 1999/08/21
+# This file was automatically generated by tmake at 23:21, 1999/08/22
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -1305,6 +1305,7 @@ MSW_GENERICDEPS = \
 		wizard.d
 
 MSW_COMMONOBJS = \
+		parser.o \
 		choiccmn.o \
 		cmndata.o \
 		config.o \
@@ -1388,6 +1389,7 @@ MSW_COMMONOBJS = \
 		zstream.o
 
 MSW_COMMONDEPS = \
+		parser.d \
 		choiccmn.d \
 		cmndata.d \
 		config.d \

configure.in

@@ -1384,6 +1384,9 @@ WXGTK12=
 
 WXWINE=
 
+dnl Extension for programs; '.exe' for msw builds
+PROGRAM_EXT= 
+
 if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
     AC_MSG_CHECKING(for Windows headers)
     WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
@@ -1411,6 +1414,7 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
     GENERICOBJS=MSW_GENERICOBJS
     UNIXOBJS=
     GUIDIST=MSW_DIST
+    PROGRAM_EXT=.exe
 fi
 
 if test "$wxUSE_GTK" = 1; then
@@ -2692,6 +2696,7 @@ AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_LIBRARY_LINK1)
 AC_SUBST(WX_LIBRARY_LINK2)
 AC_SUBST(WX_LIBRARY_LINK3)
+AC_SUBST(PROGRAM_EXT)
 
 dnl are we supposed to create the links?
 AC_SUBST(WX_CREATE_LINKS)

distrib/msw/tmake/unx.t

@@ -366,9 +366,11 @@ MSW_GENERICDEPS = \
 		#$ ExpandList("WXMSW_GENERICDEPS");
 
 MSW_COMMONOBJS = \
+		parser.o \
 		#$ ExpandList("WXMSW_COMMONOBJS");
 
 MSW_COMMONDEPS = \
+		parser.d \
 		#$ ExpandList("WXMSW_COMMONDEPS");
 
 MSW_GUIOBJS = \

setup.h.in

@@ -79,7 +79,11 @@
 #undef __EMX__
 #undef _GNU_SOURCE
 
+/* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
+#ifndef __WINDOWS__
 #undef __WINDOWS__
+#endif
+
 #undef __WIN95__
 #undef __WIN32__
 #undef __GNUWIN32__
@@ -280,6 +284,7 @@
 #define wxUSE_TOOLBAR 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__)
+#define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif

src/common/parser.y

@@ -120,7 +120,10 @@ arg1	:	WORD
 
 %%
 
-#if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) && !defined(NO_CONFIGURE)
+/* We include lexer.c if we are building for gtk, wine or motif
+ * and also whenever we are using configure (marked by __WX_SETUP_H__) for,
+ * for example, cross compilation. */
+#if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) || defined(__WX_SETUP_H__) && !defined(NO_CONFIGURE)
 #include "lexer.c"
 #else
 #if (defined(__MWERKS__))

src/make.env.in

@@ -11,7 +11,7 @@
 ####################### GENERAL SETTINGS ############################
 
 
-EXTRALIBS = @EXTRA_LIBS@
+EXTRA_LIBS = @EXTRA_LIBS@
 LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
 
 TOOLKIT = @TOOLKIT@

src/makeprog.env.in

@@ -3,6 +3,10 @@
 # Clears all default suffixes
 .SUFFIXES:	.o .cpp .c .cxx
 
+# The binary program extension, if any, including dots (e.g. '.exe')
+PROGRAM_EXT = @PROGRAM_EXT@
+BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
+
 .c.o :
 	$(CCC) -c $(CFLAGS) -o $@ $<
 
@@ -17,10 +21,10 @@ VPATH = :$(top_srcdir)/$(program_dir)
 # Set defaults from configure
 include $(top_builddir)/src/make.env
 
-all:    $(PROGRAM) install_dirs install_data
+all:    $(BIN_PROGRAM) install_dirs install_data
 
-$(PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
+$(BIN_PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
-	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(EXTRALIBS) $(LDLIBS)
+	$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(EXTRALIBS) $(LDLIBS)
 
 install_dirs:
 	@list='$(DATADIRS)'; for p in $$list; do \
@@ -35,4 +39,4 @@ install_data:
 	done
 
 clean:
-	rm -f $(OBJECTS) $(PROGRAM) core
+	rm -f $(OBJECTS) $(BIN_PROGRAM) core