Commit graph

76 commits

Author SHA1 Message Date
Francois Gouget
c7201ce3ce Add CEXTRA AND CXXEXTRA fields so we can pass -mno-cygwin to winegcc
but not to wrc which chokes on it. Add RCEXTRA for symetry and for the
user.
Remove T_INIT and get_default_init(). These are obsolete (used to
select the entry-point, WinMain or main).
If the directory contains headers, then add '.' to INCLUDE_PATH.
Specify -mnocygwin during the link stage if we are to link with the
msvcrt.
Transform XXX_APPMODE into XXX_LDFLAGS for more flexibility.
Correctly pass '-mconsole' or '-mwindows' to the link stage.
Remove XXX_BASEMODULE, XXX_SPEC_SRCS and SPEC_SRCS. They are
obsolete.
Add implicit build rules for .c, .cpp, .cxx files so that our settings
(e.g. INCLUDE_PATH) are used.
Fix the rule for building RC files (it was invalid and rejected by
make). Convert it to an implicit rule like the others.
Add rules for 'make clean'.
Add the missing rules for recursive compilation.
Remove obsolete elements from the link command (LDDLLFLAGS,
ALL_LIBRARY_PATH, LIBS).
2004-03-03 02:19:20 +00:00
Dimitrie O. Paun
905658c463 Generate a simple Makefile that uses winegcc to compile.
No longer generate a configure script, that's project policy.
2004-02-27 21:24:20 +00:00
Kirill Smelkov
5420ec4781 Try to use -fshort-wchar if possible. 2004-02-03 00:09:09 +00:00
Francois Gouget
15487bcac6 Link with msvcrt and use the msvcrt headers by default to improve the
Visual C++ compatibility.
Add a '--nomsvcrt' option to generate makefiles that do not use
msvcrt.
2004-02-02 23:02:32 +00:00
Francois Gouget
b1ff875d0e Update the handling of uuid.
Modify the autoconf script to detect '-z defs' and '-init/-fini'.
2004-01-30 22:55:00 +00:00
Kirill Smelkov
599b0b73c5 Added mfc/Include and mfc/src as possible places for includes and the
library.
2003-12-15 21:06:55 +00:00
Kirill Smelkov
746c6feccf Added test for -fms-extensions to generated configure.ac. 2003-12-15 19:46:34 +00:00
Pierre d'Herbemont
794bf0fda0 Add Darwin/Mac OS X support to the build system. 2003-11-25 03:31:26 +00:00
Francois Gouget
72143c68fc Fix the generation of wineapploader in sub directories. 2003-11-18 19:39:11 +00:00
Francois Gouget
1dd5325427 Add support for .dbg.c files. This makes it possible to use the Wine
tracing macros in Winelib applications.
The wine/lib, wine/ole, wine/unicode directories are gone. Simplify
the wine_unicode and wine_uuid detection.
Fix generation of the clean target (in some corner cases it could
generate a $(RM) command with no parameter).
Move the distclean target to the top-level Makefile and make it more
thorough.
Update a few autoconf constructs.
Remote commented out code in wrapper.c. If we need that code we can
always get it from CVS.
2003-10-28 21:13:54 +00:00
Alexandre Julliard
fa755119be libntdll.dll.so no longer exists, check for libntdll.def instead. 2003-10-27 22:14:15 +00:00
Martin Wilck
95c5a2b691 Fix -i option for winebuild linking. 2003-08-05 18:31:32 +00:00
Juraj Hercek
8df180a624 Fixed generation of makefiles and wrapper files when "--wrap" option
is used.
2003-04-08 19:42:30 +00:00
Dimitrie O. Paun
b29fa342af Do not pass unnecessary flags to wrc in generated makefiles. 2003-03-27 18:36:27 +00:00
Marcus Meissner
18e7e0d933 Include $prefix/include/wine/windows into the WINE include search path.
wrc no longer understands -r (not needed).
2003-01-20 23:27:49 +00:00
Alexandre Julliard
d9ebfe6d4f Removed a couple of no longer used tests in the generated configure
script.
2003-01-03 22:36:39 +00:00
Jeff Smith
caa74b66be Several improvements and corrections, foremost being correcting wrc
flags and shared object file naming.
2003-01-02 19:27:23 +00:00
Jeff Smith
c327246af3 Updated winemaker to account for change in wine's linking method. 2002-12-15 03:00:40 +00:00
Jeff Smith
8232cbdacb Add 'distclean' target to winemaker-generated projects. 2002-12-12 22:26:18 +00:00
Alexandre Julliard
910851a20e Added winebuild -e option to specify the entry point and removed the
'init' spec file directive.
Winebuild long options now use a more standard double dash format
(older format still supported for backwards compatibility).
2002-11-06 20:02:59 +00:00
Bill Medland
f38979349b Minor typo fix. 2002-09-29 17:59:58 +00:00
Francois Gouget
af9978e101 Updated the wrapper code to match the new naming executable and
library conventions.
Executables don't need spec files.
Removed unused code.
2002-09-27 22:06:56 +00:00
Francois Gouget
635eb3c2ae Bring the naming of libraries and executable up to current standards.
Install dlls and executables in dlldir.
It is no longer necessary to import ntdll.dll.
2002-09-26 03:20:59 +00:00
Martin Wilck
4ae4d66159 Make all target names lower case. 2002-09-18 18:30:29 +00:00
Martin Wilck
0f298433d7 Fix "install" and "uninstall" targets: .exe -> .exe.so; target dir is
$(dlldir), like for the "builtin" wine binaries.
2002-09-17 18:31:31 +00:00
Martin Wilck
29d48a504f - Support "-imsvcrt" as an abbreviation of "-imsvcrt.dll".
- Automatically add MSVCRT include path if MSVCRT DLL was requested.
2002-09-13 17:55:54 +00:00
Martin Wilck
90d6528099 - fix perl syntax error in my own patch
- fix perl syntax error in generate_wrapper_file()
- fix order of arguments generate_from_template() in generate_wrapper_file()
- don't ignore command line -l, -I, and -i arguments
- build wrapper with a minimal set of DLLs/libraries
- fix autoconf invocation to support both 2.5x and 2.13
- fix usage message for --nodlls
- target_init(\$global_settings) must not be done after reading command line
- fix appName declaration in wrapper code
2002-09-13 17:43:25 +00:00
Francois Gouget
d19aa5b702 Store the global settings in Make.rules.in instead of duplicating them
in each Makefile.in file.
Introduce generate_from_template which replaces generate_configure
and generate_generic
Simplify the wrapper generation by using generate_from_template.
Rename configure.in to configure.ac. Now works with autoconf 2.5x.
2002-09-11 01:09:58 +00:00
Francois Gouget
85c048f3d8 Fix the Wine detection when using the Wine source tree. 2002-09-11 00:45:16 +00:00
Francois Gouget
96047ce941 Fix detection of 'ln -s'.
Fix computation of TOPOBJDIR.
Install exes and dlls in $(libdir).
-Wl,-rpath is not relevant for dlls.
2002-09-10 00:42:43 +00:00
Martin Wilck
3aa9e8c663 - Fix --nomfc option which is currrently broken.
- Add --nodlls option for small apps.
2002-09-10 00:20:27 +00:00
Martin Wilck
a76d1a330e - Add "-ldl" for wrapper apps.
- fix Makefile for --wrap.
- Fix wrapper code which was broken for console apps.
2002-09-09 19:17:52 +00:00
Francois Gouget
e3d26a3e3c Add prototypes to all functions.
Make winemaker work in 'strict' mode.
2002-09-06 18:36:19 +00:00
Andriy Palamarchuk
a8b66d5f7b Updated to generate build scripts working with current Wine, use some
Wine conventions.
Generated configure now finds libraries in binary Wine installation.
2002-08-09 00:57:57 +00:00
Andriy Palamarchuk
9b9d85fe4c winebuild searches libraries specified in -l parameter only in the
library directories specified before in the -L parameter, but
winemaker added -L parameter after -l.
2002-07-25 23:55:29 +00:00
Gregg Mattinson
2aad72c426 - Removed name, type, mode, rsrc, and import statements from .spec
file.
- Added imports and resources to Makefile.in.
- Checked for __sparc__ and __sun__, same as Wine's configure.
- Checked $WINE_ROOT/library for library files.
- Changed mixedcrt directory to msvcrt.
2002-07-19 03:15:20 +00:00
Alexandre Julliard
7cae558bdc Removed some more trailing whitespace. 2002-06-01 02:55:48 +00:00
Martin Wilck
4b807a1fc2 Fix winemaker-generated references to dlls that have changed their names. 2002-04-14 19:31:23 +00:00
Alexandre Julliard
0799c1a780 Added LGPL standard comment, and copyright notices where necessary.
Global replacement of debugtools.h by wine/debug.h.
2002-03-09 23:29:33 +00:00
Francois Gouget
42dcd97e4c 'test -e' is not supported on Solaris, replace with '-f' or '-d'. 2002-01-29 17:52:28 +00:00
Francois Gouget
60cccba562 Fix handling of empty lists in install and uninstall targets.
Install the executables .so libraries in $bindir (not $libdir!).
2001-10-14 16:06:18 +00:00
Francois Gouget
3b3025b6f8 Fix the Wine tools search path.
Add /usr/local/lib to the default ntdll search path.
2001-10-12 18:41:26 +00:00
Francois Gouget
4c282bf49b Fix the .spec.c rule. 2001-10-11 20:47:26 +00:00
Francois Gouget
d599c5a9b5 Wrappers must always be compiled in STRICT mode. 2001-10-08 20:30:18 +00:00
Bill Medland
ce4e0a6158 Add support for making a build environment without editing the source
and spec files.
2001-09-24 01:11:50 +00:00
Francois Gouget
89a0c02b3f Fix handling of the '--with-wine-xxx' options: only look in the
specified path.
Libraries and wine dlls are separate notions that need separate paths
-> add WINE_DLL_{ROOT,PATH}, --with-wine-dlls and a '-P' option.
Small fixes to the search order.
2001-07-30 18:44:48 +00:00
Francois Gouget
849cea008b Put the per project paths before the wine paths.
Remove unnecessary libraries from the wine link test.
Move DLL_LINK from configure.in to the Make.rules file.
2001-07-27 23:56:58 +00:00
Bill Medland
987ea4688b Get winemaker to drop the trailing CtrlZ that is still to be found on
quite a lot of DOS files.
2001-07-12 22:21:44 +00:00
Francois Gouget
27e7f28d8b INSTALL_LIBRARY does not exist, use INSTALL_PROGRAM. Fix handling of
the INSTALL* variables.
Winelib applications don't need to link with X, i386, ossaudio, xpg4,
mmap, util, dl or curses. Only wine does (normally).
Remove YACC & LEX variables (Make.rules.in).
Winemaker's makefiles don't use ldconfig.
2001-06-04 02:50:29 +00:00
Francois Gouget
27c3b59124 configure.in: Remove unnecessary AC_PROG_RANLIB check
Make.rules.in: Add missing CXX variable
Cosmetic changes
2001-05-29 20:50:58 +00:00