Commit Graph

162 Commits

Author SHA1 Message Date
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
Francois Gouget 35246cbb8d Remove the anonymous function parameter from generate_list calls when
it is unnecessary.
Modify the .spec.c rule to allow compilation out of $(TOPSRCDIR).
2001-05-07 18:19:57 +00:00
Francois Gouget 3fafafa937 Files with special characters may not have been renamed. Try to match
both forms.
2001-04-23 18:16:13 +00:00
Francois Gouget 647bb8f03d Fix file lossage in subdirectories of an 'include' directory (closes #163).
When case fixing #includes, take into account that the file may have
been renamed (closes #161).
Better support of $(SRCDIR) in -I directives.
RTF was not recognised in rc files because it was in the wrong place.
Escape weird characters when putting the rc filename in the spec file.
2001-04-20 18:26:35 +00:00
Francois Gouget c1159bedb0 Enhanced the pragma pack handling.
Enhanced the 'afxres.h' handling (the indentation).
Start issuing winemaker's warnings in the source files themselves.
2001-04-18 17:39:42 +00:00
Francois Gouget 3c6c20f89d Added handling of .hpp files (another extension for C++ headers).
The wrapper code needs to import dlls too.
All the generated wrapper files were identical, the 'variable'
subsitution was done on the template itself. Oups!
2001-03-23 19:07:59 +00:00
Francois Gouget d554996c1e Set LD_LIBRARY_PATH if necessary before calling wrc & winebuild. 2001-03-16 16:39:02 +00:00
Francois Gouget 49fc317f23 Added missing extension for 'ole32.dll'. 2001-03-10 19:15:16 +00:00
Francois Gouget 8d0e1e767a If a target has C++ sources, then use g++ to link it (fixes #162).
Removed SONAME, it's not relevant for dlls and was unused anyway.
2001-03-04 01:03:55 +00:00
Francois Gouget 3266b88746 Add files found in an 'include' directory, to the 'misc sources' list. 2001-03-03 00:17:11 +00:00
Francois Gouget afa36ce1f1 Reenable the wrapper support. 2001-03-01 22:11:10 +00:00
François Gouget a62703e676 Make sure all files are terminated with a '\n'.
Remove obsolete comment about 'afxres.h' coming back after editing in VC.
Added support for the RTF qualifier in RC files.
2001-02-12 01:22:58 +00:00
François Gouget 38b3ac5986 Create the main_target in single-target mode.
The defined(@array) construct is said to be deprecated, avoid it.
Simplify the usage reporting.
Add a word of caution to the usage message.
2001-01-11 20:17:42 +00:00
François Gouget c1f016be08 Require that the user specify a work directory. This provides a
safeguard against accidental invocations.
2001-01-10 22:43:21 +00:00
François Gouget ba5bb0bb11 (configure) Look for the headers in $WINE_ROOT/include/wine and
/opt/wine/include/wine.
2001-01-09 20:50:34 +00:00
Alexandre Julliard c4d1176754 Renamed libuuid.a to libwine_uuid.a 2000-12-27 19:06:44 +00:00
Francois Gouget 73995e2e4c Always link with uuid. 2000-12-15 22:58:55 +00:00
Francois Gouget a11664cc9b Added a prototype for closesocket. 2000-12-07 23:13:23 +00:00
Francois Gouget 4ec10596ce If there is a single target, it should also get the 'project_settings
sources'.
If a subdirectory is called 'include' then add it to the include path.
2000-12-02 20:12:45 +00:00
Francois Gouget 3af251e4d8 - In interactive mode, don't ignore invalid options, ask the user again
- Uppercase extensions are not supported after all (hint: $(SRC:.c=.o))
- Pass the global defines and include path to WRC
- Base the cleanup on the OBJS variable so that it works even if the
  sources are in a subdirectory
2000-11-30 20:36:04 +00:00
Francois Gouget fb5b590ed1 - Fix the handling of relative include/library paths
- In interactive mode, print "./" for the top level directory rather
  than an empty string
- We don't need to force a space before assignments
- Align TOPSRCDIR & co like all the other assignements
- Compile Dlls first (dependencies would do it more or less anyway)
- Wording change in the usage
2000-11-30 20:34:39 +00:00
Francois Gouget 82747b7d76 When autodetected the MFC were still generating wrappers.
Fixed inconsistencies in the use of 'no' in the option names.
Updated the MFC link-list (configure.in).
Made the Makefile.in layout more readable.
2000-11-25 01:38:39 +00:00
Francois Gouget be85959226 Distinguish between IMPORTS and LIBRARIES.
Renamed LIBRARIES to DLLS to avoid confusion with the above, renamed
PROGRAMS to EXES to match.
Added a '-i' option for importing a Winelib library. '-l' is still
there but is only used for linking in the Unix sense.
Disabled the 'wrapper' options. It will be removed as a separate
patch.
No longer link with all of Wine's libraries.
Import the same default set of dlls as Visual Studio.
Avoid duplicate imports when generating the .spec file.
Updated the way winebuild is used.
Link applications as libraries and create a symbolic link to wine.
Detect where 'wine' is located in the configure script.
Removed unused/no longer used variables: DLLFLAGS, XLIB, X_DLLS,
XFILES, DLLS (configure.in)
Updated LDSHARED AND LDDLLFLAGS detection (configure.in).
Removed the rules pertaining to spec files from the Make.rules.
Updated the clean command to remove the symbolic links.
2000-11-15 22:12:20 +00:00
Francois Gouget 7f1ab7acf6 Fixed the detection of the link flags for NetBSD/Cygwin (configure.in)
Added AC_PATH_HEADER and AC_PATH_LIBRARY
Better header/library detection. Now works if things are already in
the include/library path
Look for the wine/MFC headers and libraries in more places so that it
works out of the box if Wine/MFC is installed in a standard place
(although there is not really a standard place yet for the MFC)
Renamed the '--with-xxx' options to have simpler more natural names
Renamed the corresponding 'WINELIB_xxx' variables to 'WINE_xxx'
2000-11-13 04:13:22 +00:00
Francois Gouget a106edb71a Convert include statements of not-found files to lower case by
default
Added --no-lower-include option to override the above
Beautified the interactive mode output to make it easier to follow
Interactive mode: support the --mfc and --wrap options for both
projects and targets
Fixed the mfc/wrap propagation between project and targets (goes both
ways)
Autodetect MFC based projects by looking for an 'stdafx.(cpp|h)' file
Don't put the stdafx.cpp file in the list of files to compile (it's
just there for pre-compiled headers, yuk)
Fixed LD_LIBRARY_PATH when linking an application with a library from
the same makefile
Don't forget 'extra' sources when looking for a file for configure.in
Renamed the '--no-makefile' option to '-no-generated-file'
2000-11-10 22:29:11 +00:00
Francois Gouget b430295cf6 Fix the include path handling in get_real_include_name
Modified get_real_include_name so that it can follow an include path
starting with $(TOPSRCDIR)
Indent the debug messages a bit more so that winemaker's is still
readable when they are on
The ATL_INCLUDE_ROOT variable was set wrong (configure.in)
The MFC include path must contain the path to the ATL headers
(configure.in)
2000-11-07 20:27:16 +00:00
Francois Gouget 755bb92e15 New script for porting Windows source code to WineLib. 2000-11-05 05:23:39 +00:00