Alexandre Julliard : makefiles: Use the -m16 option with 16-bit resources for consistency.

Alexandre Julliard julliard at winehq.org
Thu Sep 30 11:23:34 CDT 2010


Module: wine
Branch: master
Commit: 88be48ebebb692ac5b7eaa5e8643e5277960111f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=88be48ebebb692ac5b7eaa5e8643e5277960111f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Sep 29 20:15:57 2010 +0200

makefiles: Use the -m16 option with 16-bit resources for consistency.

---

 dlls/display.drv16/Makefile.in |    2 +-
 dlls/gdi.exe16/Makefile.in     |    2 +-
 dlls/krnl386.exe16/Makefile.in |    2 +-
 dlls/mouse.drv16/Makefile.in   |    2 +-
 dlls/ole2nls.dll16/Makefile.in |    2 +-
 dlls/shell.dll16/Makefile.in   |    2 +-
 dlls/user.exe16/Makefile.in    |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in
index 60e9392..1c2f34c 100644
--- a/dlls/display.drv16/Makefile.in
+++ b/dlls/display.drv16/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = display.drv16
 IMPORTS   = user32
 
 EXTRADLLFLAGS = -m16
-EXTRARCFLAGS  = -O res16
+EXTRARCFLAGS  = -m16
 
 C_SRCS = display.c
 
diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in
index 66afc86..8f87e28 100644
--- a/dlls/gdi.exe16/Makefile.in
+++ b/dlls/gdi.exe16/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = gdi.exe16
 IMPORTS   = user32 advapi32 gdi32
 
 EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520
-EXTRARCFLAGS  = -O res16
+EXTRARCFLAGS  = -m16
 
 C_SRCS = \
 	bidi.c \
diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in
index 537dbdc..6c7e5ea 100644
--- a/dlls/krnl386.exe16/Makefile.in
+++ b/dlls/krnl386.exe16/Makefile.in
@@ -4,7 +4,7 @@ IMPORTS   = winecrt0 kernel32 ntdll
 DELAYIMPORTS = ddraw dsound user32
 EXTRAIMPLIBFLAGS = -m16
 EXTRADLLFLAGS = -m16 -nodefaultlibs -Wb,--dll-name,kernel
-EXTRARCFLAGS  = -O res16
+EXTRARCFLAGS  = -m16
 
 C_SRCS = \
 	atom.c \
diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in
index 0749fbd..c74e423 100644
--- a/dlls/mouse.drv16/Makefile.in
+++ b/dlls/mouse.drv16/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = mouse.drv16
 IMPORTS   = user32
 
 EXTRADLLFLAGS = -m16
-EXTRARCFLAGS  = -O res16
+EXTRARCFLAGS  = -m16
 
 C_SRCS = mouse.c
 
diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in
index a8fdd84..f7cf735 100644
--- a/dlls/ole2nls.dll16/Makefile.in
+++ b/dlls/ole2nls.dll16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = ole2nls.dll16
 
 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
-EXTRARCFLAGS  = -O res16
+EXTRARCFLAGS  = -m16
 
 C_SRCS = ole2nls.c
 
diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in
index 17bbf0c..5512b54 100644
--- a/dlls/shell.dll16/Makefile.in
+++ b/dlls/shell.dll16/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = shell.dll16
 IMPORTS   = shell32 user32 gdi32 advapi32
 
 EXTRADLLFLAGS = -m16 -Wb,--main-module,shell32.dll
-EXTRARCFLAGS  = -O res16
+EXTRARCFLAGS  = -m16
 
 C_SRCS = shell.c
 
diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in
index 7860f43..b50b3c9 100644
--- a/dlls/user.exe16/Makefile.in
+++ b/dlls/user.exe16/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = user.exe16
 IMPORTS   = mpr user32 gdi32
 EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
-EXTRARCFLAGS  = -O res16
+EXTRARCFLAGS  = -m16
 
 C_SRCS = \
 	bidi.c \




More information about the wine-cvs mailing list