Skip to content

W
wine-winehq
Commit caa74b66 authored by Jeff Smith's avatar Jeff Smith Committed by Alexandre Julliard
Browse files
Options

Several improvements and corrections, foremost being correcting wrc

flags and shared object file naming.
parent 4715b802
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 34 deletions
tools/winemaker
View file @ caa74b66
...@@ -677,6 +677,8 @@ sub source_scan_directory($$$$) ...@@ -677,6 +677,8 @@ sub source_scan_directory($$$$)
$name =~ s+(/|\.[^.]*)$++; $name =~ s+(/|\.[^.]*)$++;
if ($opt_target_type == $TT_DLL) { if ($opt_target_type == $TT_DLL) {
$name = "$name.dll"; $name = "$name.dll";
} else {
$name = "$name.exe";
} }
$targets{$name}=1; $targets{$name}=1;
} }
...@@ -1784,8 +1786,24 @@ sub generate_project_files($) ...@@ -1784,8 +1786,24 @@ sub generate_project_files($)
# Iterate over all the targets... # Iterate over all the targets...
foreach my $target (@{@$project[$P_TARGETS]}) { foreach my $target (@{@$project[$P_TARGETS]}) {
print FILEO "### @$target[$T_NAME] sources and settings\n\n"; print FILEO "### @$target[$T_NAME] sources and settings\n\n";
my $appmode;
my $basemodule=@$target[$T_NAME];
my $canon=canonize("@$target[$T_NAME]"); my $canon=canonize("@$target[$T_NAME]");
$canon =~ s+_so$++; $canon =~ s+_so$++;
if (@$target[$T_TYPE] == $TT_CUIEXE) {
$appmode = "cui";
$basemodule =~ s/\.exe$//;
} elsif (@$target[$T_TYPE] == $TT_GUIEXE) {
$appmode = "gui";
$basemodule =~ s/\.exe$//;
} else {
$appmode = "";
$basemodule =~ s/\.dll$//;
}
generate_list("${canon}_MODULE",1,[@$target[$T_NAME]]);
generate_list("${canon}_BASEMODULE",1,[$basemodule]);
generate_list("${canon}_APPMODE",1,[$appmode]);
generate_list("${canon}_C_SRCS",1,@$target[$T_SOURCES_C]); generate_list("${canon}_C_SRCS",1,@$target[$T_SOURCES_C]);
generate_list("${canon}_CXX_SRCS",1,@$target[$T_SOURCES_CXX]); generate_list("${canon}_CXX_SRCS",1,@$target[$T_SOURCES_CXX]);
generate_list("${canon}_RC_SRCS",1,@$target[$T_SOURCES_RC]); generate_list("${canon}_RC_SRCS",1,@$target[$T_SOURCES_RC]);
...@@ -1862,7 +1880,7 @@ sub generate_project_files($) ...@@ -1862,7 +1880,7 @@ sub generate_project_files($)
print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) install) || exit 1; done\n"; print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) install) || exit 1; done\n";
} }
if (@{@$project[$P_TARGETS]} > 0) { if (@{@$project[$P_TARGETS]} > 0) {
print FILEO "\t_list=\"\$(EXES)\"; for i in \$\$_list; do \$(INSTALL_SCRIPT) \$\$i \$(bindir); done\n"; print FILEO "\t_list=\"\$(EXES:%.exe=%)\"; for i in \$\$_list; do \$(INSTALL_SCRIPT) \$\$i \$(bindir); done\n";
print FILEO "\t_list=\"\$(EXES:%=%.so) \$(DLLS:%=%.so)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(dlldir); done\n"; print FILEO "\t_list=\"\$(EXES:%=%.so) \$(DLLS:%=%.so)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(dlldir); done\n";
} }
print FILEO "\n"; print FILEO "\n";
...@@ -1873,7 +1891,7 @@ sub generate_project_files($) ...@@ -1873,7 +1891,7 @@ sub generate_project_files($)
print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) uninstall) || exit 1; done\n"; print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) uninstall) || exit 1; done\n";
} }
if (@{@$project[$P_TARGETS]} > 0) { if (@{@$project[$P_TARGETS]} > 0) {
print FILEO "\t_list=\"\$(EXES)\"; for i in \$\$_list; do \$(RM) \$(bindir)/\$\$i;done\n"; print FILEO "\t_list=\"\$(EXES:%.exe=%)\"; for i in \$\$_list; do \$(RM) \$(bindir)/\$\$i;done\n";
print FILEO "\t_list=\"\$(EXES:%=%.so) \$(DLLS:%=%.so)\"; for i in \$\$_list; do \$(RM) \$(dlldir)/\$\$i;done\n"; print FILEO "\t_list=\"\$(EXES:%=%.so) \$(DLLS:%=%.so)\"; for i in \$\$_list; do \$(RM) \$(dlldir)/\$\$i;done\n";
} }
print FILEO "\n"; print FILEO "\n";
...@@ -1883,7 +1901,7 @@ sub generate_project_files($) ...@@ -1883,7 +1901,7 @@ sub generate_project_files($)
print FILEO " wineapploader"; print FILEO " wineapploader";
} }
if (@{@$project[$P_TARGETS]} > 0) { if (@{@$project[$P_TARGETS]} > 0) {
print FILEO " \$(EXES)"; print FILEO " \$(EXES:%.exe=%)";
} }
print FILEO "\n\n"; print FILEO "\n\n";
...@@ -1896,10 +1914,8 @@ sub generate_project_files($) ...@@ -1896,10 +1914,8 @@ sub generate_project_files($)
my $all_libs; my $all_libs;
$canon =~ s/_so$//; $canon =~ s/_so$//;
if (@$target[$T_TYPE] == $TT_GUIEXE) { if ((@$target[$T_TYPE]==$TT_GUIEXE) || (@$target[$T_TYPE]==$TT_CUIEXE)) {
$mode = "-m gui --exe @$target[$T_NAME]"; $mode = "--exe \$(${canon}_MODULE) -m\$(${canon}_APPMODE)";
} elsif (@$target[$T_TYPE] == $TT_CUIEXE) {
$mode = "-m cui --exe @$target[$T_NAME]";
} else { } else {
$mode = ""; $mode = "";
} }
...@@ -1912,18 +1928,18 @@ sub generate_project_files($) ...@@ -1912,18 +1928,18 @@ sub generate_project_files($)
$all_libs="\$(${canon}_LIBRARIES:%=-l%) \$(ALL_LIBRARIES)"; $all_libs="\$(${canon}_LIBRARIES:%=-l%) \$(ALL_LIBRARIES)";
} }
print FILEO "@$target[$T_NAME].spec.c: \$(${canon}_SPEC_SRCS) \$(${canon}_RC_SRCS:.rc=.res) \$(${canon}_OBJS)\n"; print FILEO "\$(${canon}_MODULE).spec.c: \$(${canon}_SPEC_SRCS) \$(${canon}_RC_SRCS:.rc=.res) \$(${canon}_OBJS)\n";
print FILEO "\t\$(LD_PATH) \$(WINEBUILD) -fPIC -o \$\@ \$(${canon}_SPEC_SRCS:%=--spec %) \$(${canon}_RC_SRCS:%.rc=-r %.res) \$(${canon}_DLL_PATH) \$(WINE_DLL_PATH) \$(GLOBAL_DLL_PATH) $all_dlls $mode \$(${canon}_OBJS)\n"; print FILEO "\t\$(LDPATH) \$(WINEBUILD) -fPIC -o \$\@ $mode \$(${canon}_SPEC_SRCS:%=--spec %) \$(${canon}_RC_SRCS:%.rc=%.res) \$(${canon}_OBJS) \$(${canon}_DLL_PATH) \$(WINE_DLL_PATH) \$(GLOBAL_DLL_PATH) $all_dlls\n";
print FILEO "\n"; print FILEO "\n";
print FILEO "@$target[$T_NAME].so: @$target[$T_NAME].spec.o \$(${canon}_OBJS) \$(${canon}_DEPENDS) \n"; print FILEO "\$(${canon}_MODULE).so: \$(${canon}_MODULE).spec.o \$(${canon}_OBJS) \$(${canon}_DEPENDS)\n";
if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) { if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) {
print FILEO "\t\$(LDXXSHARED)"; print FILEO "\t\$(LDXXSHARED)";
} else { } else {
print FILEO "\t\$(LDSHARED)"; print FILEO "\t\$(LDSHARED)";
} }
print FILEO " \$(LDDLLFLAGS) -o \$\@ \$(${canon}_OBJS) @$target[$T_NAME].spec.o \$(${canon}_LIBRARY_PATH) \$(ALL_LIBRARY_PATH) $all_libs \$(LIBS)\n"; print FILEO " \$(LDDLLFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_MODULE).spec.o \$(${canon}_LIBRARY_PATH) \$(ALL_LIBRARY_PATH) $all_libs \$(LIBS)\n";
if (@$target[$T_TYPE] ne $TT_DLL) { if (@$target[$T_TYPE] != $TT_DLL) {
print FILEO "\ttest -f @$target[$T_NAME] || \$(INSTALL_SCRIPT) wineapploader @$target[$T_NAME]\n"; print FILEO "\ttest -f \$(${canon}_BASEMODULE) || \$(INSTALL_SCRIPT) wineapploader \$(${canon}_BASEMODULE)\n";
} }
print FILEO "\n\n"; print FILEO "\n\n";
} }
...@@ -1931,7 +1947,7 @@ sub generate_project_files($) ...@@ -1931,7 +1947,7 @@ sub generate_project_files($)
close(FILEO); close(FILEO);
foreach my $target (@{@$project[$P_TARGETS]}) { foreach my $target (@{@$project[$P_TARGETS]}) {
if (@$target[$T_TYPE] eq $TT_DLL) { if (@$target[$T_TYPE] == $TT_DLL) {
generate_spec_file(@$project[$P_PATH],$target,$project_settings); generate_spec_file(@$project[$P_PATH],$target,$project_settings);
} }
if (@$target[$T_FLAGS] & $TF_WRAPPER) { if (@$target[$T_FLAGS] & $TF_WRAPPER) {
...@@ -2622,7 +2638,7 @@ AC_SUBST($1) ...@@ -2622,7 +2638,7 @@ AC_SUBST($1)
dnl **** Try to find where winelib is located **** dnl **** Try to find where winelib is located ****
LD_PATH="" LDPATH=""
WINE_INCLUDE_ROOT="" WINE_INCLUDE_ROOT=""
WINE_INCLUDE_PATH="" WINE_INCLUDE_PATH=""
WINE_LIBRARY_ROOT="" WINE_LIBRARY_ROOT=""
...@@ -2736,7 +2752,7 @@ AC_PATH_LIBRARY(WINE_LIBRARY_ROOT,[-lwine],[],[ ...@@ -2736,7 +2752,7 @@ AC_PATH_LIBRARY(WINE_LIBRARY_ROOT,[-lwine],[],[
if test -n "$WINE_LIBRARY_ROOT" if test -n "$WINE_LIBRARY_ROOT"
then then
WINE_LIBRARY_PATH="-L$WINE_LIBRARY_ROOT" WINE_LIBRARY_PATH="-L$WINE_LIBRARY_ROOT"
LD_PATH="$WINE_LIBRARY_ROOT" LDPATH="$WINE_LIBRARY_ROOT"
else else
WINE_LIBRARY_PATH="" WINE_LIBRARY_PATH=""
fi fi
...@@ -2756,7 +2772,7 @@ AC_PATH_LIBRARY(WINE_UNICODE_ROOT,[-lwine_unicode],[$WINE_LIBRARY_PATH -lwine],[ ...@@ -2756,7 +2772,7 @@ AC_PATH_LIBRARY(WINE_UNICODE_ROOT,[-lwine_unicode],[$WINE_LIBRARY_PATH -lwine],[
if test -n "$WINE_UNICODE_ROOT" -a "$WINE_UNICODE_ROOT" != "$WINE_LIBRARY_ROOT" if test -n "$WINE_UNICODE_ROOT" -a "$WINE_UNICODE_ROOT" != "$WINE_LIBRARY_ROOT"
then then
WINE_LIBRARY_PATH="$WINE_LIBRARY_PATH -L$WINE_UNICODE_ROOT" WINE_LIBRARY_PATH="$WINE_LIBRARY_PATH -L$WINE_UNICODE_ROOT"
LD_PATH="$LD_PATH:$WINE_UNICODE_ROOT" LDPATH="$LDPATH:$WINE_UNICODE_ROOT"
fi fi
if test -z "$WINE_UUID_ROOT" if test -z "$WINE_UUID_ROOT"
...@@ -2774,7 +2790,6 @@ AC_PATH_LIBRARY(WINE_UUID_ROOT,[-lwine_uuid],[$WINE_LIBRARY_PATH -lwine],[ ...@@ -2774,7 +2790,6 @@ AC_PATH_LIBRARY(WINE_UUID_ROOT,[-lwine_uuid],[$WINE_LIBRARY_PATH -lwine],[
if test -n "$WINE_UUID_ROOT" -a "$WINE_UUID_ROOT" != "$WINE_LIBRARY_ROOT" if test -n "$WINE_UUID_ROOT" -a "$WINE_UUID_ROOT" != "$WINE_LIBRARY_ROOT"
then then
WINE_LIBRARY_PATH="$WINE_LIBRARY_PATH -L$WINE_UUID_ROOT" WINE_LIBRARY_PATH="$WINE_LIBRARY_PATH -L$WINE_UUID_ROOT"
LD_PATH="$LD_PATH:$WINE_UUID_ROOT"
fi fi
if test -z "$WINE_DLL_ROOT" if test -z "$WINE_DLL_ROOT"
...@@ -2795,13 +2810,13 @@ AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll.dll],[$WINE_LIBRARY_PATH -lwine -lwine_un ...@@ -2795,13 +2810,13 @@ AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll.dll],[$WINE_LIBRARY_PATH -lwine -lwine_un
],[$WINE_DLL_ROOT]) ],[$WINE_DLL_ROOT])
WINE_DLL_PATH="-L$WINE_DLL_ROOT/wine" WINE_DLL_PATH="-L$WINE_DLL_ROOT/wine"
if test -n "$LD_PATH" if test -n "$LDPATH"
then then
LD_PATH="$LD_PATH:$WINE_DLL_ROOT" LDPATH="$LDPATH:$WINE_DLL_ROOT"
else else
LD_PATH="$WINE_DLL_ROOT" LDPATH="$WINE_DLL_ROOT"
fi fi
LD_PATH="LD_LIBRARY_PATH=\"$LD_PATH:\$\$LD_LIBRARY_PATH\"" LDPATH="LD_LIBRARY_PATH=\"$LDPATH:\$\$LD_LIBRARY_PATH\""
if test -z "$WINE_TOOL_PATH" if test -z "$WINE_TOOL_PATH"
then then
...@@ -2823,7 +2838,7 @@ then ...@@ -2823,7 +2838,7 @@ then
AC_MSG_ERROR([Could not find Wine's wrc tool]) AC_MSG_ERROR([Could not find Wine's wrc tool])
fi fi
AC_SUBST(LD_PATH) AC_SUBST(LDPATH)
AC_SUBST(WINE_INCLUDE_PATH) AC_SUBST(WINE_INCLUDE_PATH)
AC_SUBST(WINE_LIBRARY_PATH) AC_SUBST(WINE_LIBRARY_PATH)
AC_SUBST(WINE_DLL_PATH) AC_SUBST(WINE_DLL_PATH)
...@@ -3009,7 +3024,7 @@ WINE_LIBRARY_PATH = @WINE_LIBRARY_PATH@ ...@@ -3009,7 +3024,7 @@ WINE_LIBRARY_PATH = @WINE_LIBRARY_PATH@
WINE_DLL_ROOT = @WINE_DLL_ROOT@ WINE_DLL_ROOT = @WINE_DLL_ROOT@
WINE_DLL_PATH = @WINE_DLL_PATH@ WINE_DLL_PATH = @WINE_DLL_PATH@
LD_PATH = @LD_PATH@ LDPATH = @LDPATH@
# Where are the MFC # Where are the MFC
...@@ -3036,20 +3051,18 @@ CC = @CC@ ...@@ -3036,20 +3051,18 @@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@ CXX = @CXX@
WRC = @WRC@ WRC = @WRC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ $(CEXTRA)
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@ $(CXXEXTRA)
WRCFLAGS = -r -L WRCFLAGS = -J -m $(WRCEXTRA)
OPTIONS = @OPTIONS@ -D_REENTRANT -DWINELIB $(GLOBAL_DEFINES) $(GLOBAL_INCLUDE_PATH) OPTIONS = @OPTIONS@ -D_REENTRANT
LIBS = @LIBS@ $(LIBRARY_PATH) LIBS = @LIBS@ $(LIBRARY_PATH)
ALLFLAGS = $(DEFINES) -I$(SRCDIR) $(INCLUDE_PATH) $(WINE_INCLUDE_PATH) DIVINCL = $(GLOBAL_INCLUDE_PATH) -I$(SRCDIR) $(INCLUDE_PATH) $(WINE_INCLUDE_PATH)
ALLCFLAGS = $(CFLAGS) $(CEXTRA) $(OPTIONS) $(ALLFLAGS) ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(GLOBAL_DEFINES) $(DEFINES) $(OPTIONS)
ALLCXXFLAGS=$(CXXFLAGS) $(CXXEXTRA) $(OPTIONS) $(ALLFLAGS) ALLCXXFLAGS=$(DIVINCL) $(CXXFLAGS) $(GLOBAL_DEFINES) $(DEFINES) $(OPTIONS)
ALLWRCFLAGS=$(WRCFLAGS) $(WRCEXTRA) $(OPTIONS) $(ALLFLAGS)
ALL_DLL_PATH = $(DLL_PATH) $(GLOBAL_DLL_PATH) $(WINE_DLL_PATH) ALL_DLL_PATH = $(DLL_PATH) $(GLOBAL_DLL_PATH) $(WINE_DLL_PATH)
ALL_LIBRARY_PATH = $(LIBRARY_PATH) $(GLOBAL_LIBRARY_PATH) $(WINE_LIBRARY_PATH) ALL_LIBRARY_PATH = $(LIBRARY_PATH) $(GLOBAL_LIBRARY_PATH) $(WINE_LIBRARY_PATH)
WINE_LIBRARIES = -lwine -lwine_unicode -lwine_uuid WINE_LIBRARIES = -lwine -lwine_unicode -lwine_uuid
ALL_LIBRARIES = $(LIBRARIES:%=-l%) $(GLOBAL_LIBRARIES:%=-l%) $(WINE_LIBRARIES) ALL_LIBRARIES = $(LIBRARIES:%=-l%) $(GLOBAL_LIBRARIES:%=-l%) $(WINE_LIBRARIES)
LDCOMBINE = ld -r
LDSHARED = @LDSHARED@ LDSHARED = @LDSHARED@
LDXXSHARED= @LDXXSHARED@ LDXXSHARED= @LDXXSHARED@
LDDLLFLAGS= @LDDLLFLAGS@ LDDLLFLAGS= @LDDLLFLAGS@
...@@ -3101,7 +3114,7 @@ DISTCLEAN_FILES = config.* Makefile Make.rules ...@@ -3101,7 +3114,7 @@ DISTCLEAN_FILES = config.* Makefile Make.rules
$(CXX) -c $(ALLCXXFLAGS) -o $@ $< $(CXX) -c $(ALLCXXFLAGS) -o $@ $<
.rc.res: .rc.res:
$(LD_PATH) $(WRC) $(ALLWRCFLAGS) -o $@ $< $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $<
.PHONY: all install uninstall clean distclean depend dummy .PHONY: all install uninstall clean distclean depend dummy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment