X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/641d87d868e0f46f4bfca3d8d7bede88032045e1..3cc487d140f11e26a9c4ae35ba87cc22684da65a:/src/makeprog.env.in?ds=sidebyside

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index cd5731f969..9ee384b814 100644
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -6,25 +6,33 @@
 # 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 $@ $<
 
-VPATH = :$(top_srcdir)/$(program_dir)
+# 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
+# any VPATH assignment not containing ':'
+VPATH = @PATH_IFS@$(top_srcdir)/$(program_dir) # ':' for autoconf
 
 # Set defaults from configure
 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) $(EXTRALIBS) $(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 \
@@ -34,9 +42,9 @@ install_dirs:
 install_data:
 	@list='$(DATAFILES)'; for p in $$list; do \
 	  if test ! -s $(top_builddir)/$(program_dir)/$$p; then \
-	     cp -f $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+	     cp -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
 	  fi; \
 	done
 
 clean:
-	rm -f $(OBJECTS) $(BIN_PROGRAM) core
+	rm -f $(OBJECTS) $(BIN_PROGRAM)  $(RES_PROGRAM) core