André Hentschel : winemaker: Let winegcc generate the app loader script.

Alexandre Julliard julliard at winehq.org
Wed May 11 13:02:59 CDT 2011


Module: wine
Branch: master
Commit: 35c743bfec64f8bb61a661611dd3f1537fac2fa0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=35c743bfec64f8bb61a661611dd3f1537fac2fa0

Author: André Hentschel <nerv at dawncrow.de>
Date:   Wed May 11 19:00:31 2011 +0200

winemaker: Let winegcc generate the app loader script.

---

 tools/winemaker |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 33fb3d2..a561076 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -2448,7 +2448,7 @@ sub generate_project_files($)
     print FILEO " \$(SUBDIRS)";
   }
   if (@{@$project[$P_TARGETS]} > 0) {
-    print FILEO " \$(DLLS:%=%.so) \$(EXES:%=%.so)";
+    print FILEO " \$(DLLS:%=%.so) \$(EXES)";
   }
   print FILEO "\n\n";
   print FILEO "### Build rules\n";
@@ -2482,7 +2482,7 @@ sub generate_project_files($)
   print FILEO "\n";
   print FILEO "clean:: \$(SUBDIRS:%=%/__clean__) \$(EXTRASUBDIRS:%=%/__clean__)\n";
   print FILEO "\t\$(RM) \$(CLEAN_FILES) \$(RC_SRCS:.rc=.res) \$(C_SRCS:.c=.o) \$(CXX_SRCS:.cpp=.o)\n";
-  print FILEO "\t\$(RM) \$(DLLS:%=%.so) \$(EXES:%=%.so) \$(EXES:%.exe=%)\n";
+  print FILEO "\t\$(RM) \$(DLLS:%=%.so) \$(EXES) \$(EXES:%=%.so)\n";
   print FILEO "\n";
   print FILEO "\$(SUBDIRS:%=%/__clean__): dummy\n";
   print FILEO "\tcd `dirname \$\@` && \$(MAKE) clean\n";
@@ -2503,7 +2503,7 @@ sub generate_project_files($)
       } elsif (@$target[$T_TYPE] == $TT_DLL) {
         print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.spec)\n";
       } else {
-        print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n";
+        print FILEO "\$(${canon}_MODULE): \$(${canon}_OBJS)\n";
       }
       if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) {
         print FILEO "\t\$(CXX)";




More information about the wine-cvs mailing list