Commit c9eee734 authored by Alexandre Julliard's avatar Alexandre Julliard

makefiles: Define __WINESRC__ when building programs.

parent c0f65cc9
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# #
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = -DWINE_STRICT_PROTOTYPES -DWINE_NO_UNICODE_MACROS $(EXTRADEFS) DEFS = -D__WINESRC__ $(EXTRADEFS)
ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS)
INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext) INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "windows.h" #include "windows.h"
#include "commdlg.h" #include "commdlg.h"
#include "shellapi.h"
#include "main.h" #include "main.h"
#include "winclock.h" #include "winclock.h"
......
...@@ -26,7 +26,9 @@ ...@@ -26,7 +26,9 @@
*/ */
#include "config.h" #include "config.h"
#include <time.h>
#include "wcmd.h" #include "wcmd.h"
#include "shellapi.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(cmd); WINE_DEFAULT_DEBUG_CHANNEL(cmd);
......
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
* TODO: multiple monitor support * TODO: multiple monitor support
*/ */
#include "windows.h"
#include "shellapi.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h"
#include <windows.h>
#include <wine/debug.h>
#include "explorer_private.h" #include "explorer_private.h"
#include "wine/list.h" #include "wine/list.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#define OEMRESOURCE #define OEMRESOURCE
#include <windows.h> #include <windows.h>
#include <rpc.h>
#include <wine/debug.h> #include <wine/debug.h>
#include "explorer_private.h" #include "explorer_private.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <initguid.h> #include <initguid.h>
#include <windows.h> #include <windows.h>
#include <shellapi.h>
#include <shobjidl.h> #include <shobjidl.h>
#include <shlobj.h> #include <shlobj.h>
#include <shlwapi.h> #include <shlwapi.h>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#define _WIN32_IE 0x500 #define _WIN32_IE 0x500
#include <windows.h> #include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#include <shellapi.h>
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/list.h> #include <wine/list.h>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <windows.h> #include <windows.h>
#include <advpub.h> #include <advpub.h>
#include <ole2.h>
#include <rpcproxy.h> #include <rpcproxy.h>
#include "wine/unicode.h" #include "wine/unicode.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <windows.h> #include <windows.h>
#include <msi.h> #include <msi.h>
#include <winsvc.h>
#include <objbase.h> #include <objbase.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -20,8 +20,9 @@ ...@@ -20,8 +20,9 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <windows.h>
#include <winsvc.h>
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <windows.h> #include <windows.h>
#include <shellapi.h>
#include <commdlg.h> #include <commdlg.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <winternl.h> #include <winternl.h>
......
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
* *
*/ */
#include <stdio.h>
#include <windows.h> #include <windows.h>
#include <commdlg.h>
#include <shellapi.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <stdio.h>
#include "main.h" #include "main.h"
#include "dialog.h" #include "dialog.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
*/ */
#include "main.h" #include "main.h"
#include "commdlg.h"
#include "shellapi.h"
#include "wine/unicode.h" #include "wine/unicode.h"
GLOBALS globals; GLOBALS globals;
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#include "main.h" #include "main.h"
#include "commdlg.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include "winsvc.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include "winsvc.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(fontcache); WINE_DEFAULT_DEBUG_CHANNEL(fontcache);
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define OEMRESOURCE #define OEMRESOURCE
#include "windows.h" #include "windows.h"
#include "shellapi.h"
#include "progman.h" #include "progman.h"
GLOBALS Globals; GLOBALS Globals;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <windows.h> #include <windows.h>
#include <winsvc.h>
WINE_DEFAULT_DEBUG_CHANNEL(sc); WINE_DEFAULT_DEBUG_CHANNEL(sc);
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <windows.h> #include <windows.h>
#include <winsvc.h>
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <winsvc.h>
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <windows.h>
#include <winuser.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <windows.h>
#include <shlobj.h> #include <shlobj.h>
#include <shellapi.h>
#include <wine/unicode.h> #include <wine/unicode.h>
#include <wine/debug.h> #include <wine/debug.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdlib.h>
#include <windows.h> #include <windows.h>
#include <psapi.h> #include <psapi.h>
#include <wine/unicode.h> #include <wine/unicode.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <winsvc.h>
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(termsv); WINE_DEFAULT_DEBUG_CHANNEL(termsv);
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <windows.h> #include <windows.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <urlmon.h>
#include <ddeml.h> #include <ddeml.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
#define COBJMACROS #define COBJMACROS
#include <windows.h> #include <windows.h>
#include <commdlg.h>
#include <shellapi.h>
#include <uxtheme.h> #include <uxtheme.h>
#include <tmschema.h> #include <tmschema.h>
#include <shlobj.h> #include <shlobj.h>
......
...@@ -55,6 +55,8 @@ ...@@ -55,6 +55,8 @@
#include "wine/library.h" #include "wine/library.h"
#include "wine/debug.h" #include "wine/debug.h"
#undef ERR
#define ERR (-1)
WINE_DEFAULT_DEBUG_CHANNEL(curses); WINE_DEFAULT_DEBUG_CHANNEL(curses);
......
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include "debugger.h" #include "debugger.h"
#include "wine/exception.h" #include "wine/exception.h"
......
...@@ -27,10 +27,7 @@ ...@@ -27,10 +27,7 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef HAVE_UNISTD_H
#define YY_NO_UNISTD_H #define YY_NO_UNISTD_H
#endif
#include "debugger.h" #include "debugger.h"
#include "dbg.tab.h" #include "dbg.tab.h"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <winsock.h> #include <winsock2.h>
#include <wininet.h> #include <wininet.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
......
...@@ -27,10 +27,7 @@ ...@@ -27,10 +27,7 @@
#include <assert.h> #include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef HAVE_UNISTD_H
#define YY_NO_UNISTD_H #define YY_NO_UNISTD_H
#endif
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include "windows.h" #include "windows.h"
#include "shellapi.h"
int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
{ {
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <windows.h> #include <windows.h>
#include <richedit.h> #include <richedit.h>
#include <commctrl.h> #include <commctrl.h>
#include <commdlg.h>
#include "wordpad.h" #include "wordpad.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <winbase.h> #include <winbase.h>
#include <winreg.h> #include <winreg.h>
#include <ole2.h> #include <ole2.h>
#include <shellapi.h>
#include <activscp.h> #include <activscp.h>
#include <initguid.h> #include <initguid.h>
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <windows.h> #include <windows.h>
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/unicode.h> #include <wine/unicode.h>
......
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