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
This commit is contained 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@
|
||||
$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(EXTRALIBS) $(LDLIBS)
|
||||
$(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
|
||||
$(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
|
||||
|
Reference in New Issue
Block a user