Do not define __WINESRC__ when building tools and miscemu.
This commit is contained in:
parent
39720afa84
commit
f8bac62769
|
@ -172,13 +172,13 @@ $(SUBDIRS:%=%/__man__): dummy
|
||||||
cd `dirname $@` && $(MAKE) man
|
cd `dirname $@` && $(MAKE) man
|
||||||
|
|
||||||
man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
|
man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
|
||||||
if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/man3w -S3w $(DIVINCL) -D__WINESRC__ $(MANSPECS) $$i; done; fi
|
if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/man3w -S3w $(DIVINCL) $(MANSPECS) $$i; done; fi
|
||||||
|
|
||||||
$(SUBDIRS:%=%/__doc_html__): dummy
|
$(SUBDIRS:%=%/__doc_html__): dummy
|
||||||
cd `dirname $@` && $(MAKE) doc-html
|
cd `dirname $@` && $(MAKE) doc-html
|
||||||
|
|
||||||
doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
|
doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
|
||||||
if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/html -Th -iwindows.h $(DIVINCL) -D__WINESRC__ $(MANSPECS) $$i; done; fi
|
if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/html -Th -iwindows.h $(DIVINCL) $(MANSPECS) $$i; done; fi
|
||||||
|
|
||||||
.PHONY: man doc-html $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__)
|
.PHONY: man doc-html $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__)
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
DEFS = -D__WINESRC__
|
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ..
|
TOPOBJDIR = ..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
|
|
@ -62,12 +62,12 @@ int WINAPI wine_initial_task( HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, INT
|
||||||
instance = GetLastError();
|
instance = GetLastError();
|
||||||
}
|
}
|
||||||
|
|
||||||
MESSAGE( "%s: can't exec '%s': ", argv0, GetCommandLineA() );
|
WINE_MESSAGE( "%s: can't exec '%s': ", argv0, GetCommandLineA() );
|
||||||
switch (instance)
|
switch (instance)
|
||||||
{
|
{
|
||||||
case 2: MESSAGE("file not found\n" ); break;
|
case 2: WINE_MESSAGE("file not found\n" ); break;
|
||||||
case 11: MESSAGE("invalid exe file\n" ); break;
|
case 11: WINE_MESSAGE("invalid exe file\n" ); break;
|
||||||
default: MESSAGE("error=%d\n", instance ); break;
|
default: WINE_MESSAGE("error=%d\n", instance ); break;
|
||||||
}
|
}
|
||||||
ExitProcess(instance);
|
ExitProcess(instance);
|
||||||
}
|
}
|
||||||
|
@ -77,7 +77,7 @@ int WINAPI wine_initial_task( HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, INT
|
||||||
|
|
||||||
if (!(user32 = LoadLibraryA( "user32.dll" )))
|
if (!(user32 = LoadLibraryA( "user32.dll" )))
|
||||||
{
|
{
|
||||||
MESSAGE( "Cannot load user32.dll\n" );
|
WINE_MESSAGE( "Cannot load user32.dll\n" );
|
||||||
ExitProcess( GetLastError() );
|
ExitProcess( GetLastError() );
|
||||||
}
|
}
|
||||||
pGetMessageA = (void *)GetProcAddress( user32, "GetMessageA" );
|
pGetMessageA = (void *)GetProcAddress( user32, "GetMessageA" );
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
DEFS = -D__WINESRC__
|
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ../..
|
TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
DEFS = -D__WINESRC__
|
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ../..
|
TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
DEFS = -D__WINESRC__
|
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ../..
|
TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
DEFS = -D__WINESRC__
|
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ../..
|
TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
DEFS = -D__WINESRC__
|
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ../..
|
TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
DEFS = -D__WINESRC__
|
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ../..
|
TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\""
|
DEFS = -DDINCLUDEDIR="\"$(includedir)\""
|
||||||
TOPSRCDIR = @top_srcdir@
|
TOPSRCDIR = @top_srcdir@
|
||||||
TOPOBJDIR = ../..
|
TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
|
|
Loading…
Reference in New Issue