X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e9fd9e259dbd4f63f73470a9074d4a7a770bef4..6342bd1ab36c1957684c00d408d09fba65d33db6:/src/makeprog.env.in?ds=sidebyside diff --git a/src/makeprog.env.in b/src/makeprog.env.in index a875d3ee7b..9ee384b814 100644 --- a/src/makeprog.env.in +++ b/src/makeprog.env.in @@ -6,15 +6,17 @@ # The binary program extension, if any, including dots (e.g. '.exe') PROGRAM_EXT = @PROGRAM_EXT@ BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT) +RES_PROGRAM = $(PROGRAM)_resources.o +RES_PROGRAM_OPT = @RESPROGRAM@ .c.o : - $(CCC) -c $(CFLAGS) -o $@ $< + $(CCC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $< .cpp.o : - $(CC) -c $(CPPFLAGS) -o $@ $< + $(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $< .cxx.o : - $(CC) -c $(CPPFLAGS) -o $@ $< + $(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $< # the comment at the end of the next line is needed because otherwise autoconf # would remove this line completely - it contains a built-in hack to remove @@ -26,8 +28,11 @@ include $(top_builddir)/src/make.env all: $(BIN_PROGRAM) install_dirs install_data -$(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ - $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) +$(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OPT) + $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OPT) + +$(RES_PROGRAM): $(PROGRAM).rc + $(RESCOMP) $(RCINPUTSWITCH) $(top_srcdir)/$(program_dir)/$(PROGRAM).rc $(RCOUTPUTSWITCH) $(PROGRAM)_resources.o $(RESFLAGS) install_dirs: @list='$(DATADIRS)'; for p in $$list; do \ @@ -42,4 +47,4 @@ install_data: done clean: - rm -f $(OBJECTS) $(BIN_PROGRAM) core + rm -f $(OBJECTS) $(BIN_PROGRAM) $(RES_PROGRAM) core