Changeset 21338 for trunk/include

Timestamp:

Aug 14, 2009, 5:11:33 PM (16 years ago)

Author:

vladest

Message:

1. NTDLL release build was support latest GCC. fixed
2. Added HAND icon

Location:

trunk/include

Files:

• odin32.rel.emx.mk (modified) (3 diffs)
• win/winuser.h (modified) (1 diff)

trunk/include/odin32.rel.emx.mk

@@ -52 +52 @@
 AS_EMX = as
 LD     = gcc
-LD2    = link386
+LD2    = gcc
 IMPLIB = implib
 ILIB   = emxomfar
@@ -67 +67 @@
 RCFLAGS          = -s -I. -I$(CPPMAIN)\include -D__WIN32OS2__
 !ifdef WRC_PREFIX_RESOURCE
-RCFLAGS          = $(RCFLAGS) -p $(TARGET)
+RCFLAGS          = $(RCFLAGS) -p _$(TARGET)
 !endif
 OS2RCFLAGS       = -r -n
@@ -117 +117 @@
 !else
 LDTARGETFLAGS    = -Zdll -Zso -Zsys
-LD2TARGETFLAGS   = /DLL
+LD2TARGETFLAGS   = -Zdll
 !endif
-LDFLAGS          = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /packcode /packdata /exepack:2 /Nod" $(LDTARGETFLAGS) -s
-LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /packcode /packdata /exepack:2     " $(LDTARGETFLAGS) -s
-LD2FLAGS         = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /nodebug /nod $(LD2TARGETFLAGS)
+
+#LDFLAGS          = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /packcode /packdata /exepack:2 /Nod" $(LDTARGETFLAGS) -s
+#LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /packcode /packdata /exepack:2     " $(LDTARGETFLAGS) -s
+#LD2FLAGS         = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /nodebug /nod $(LD2TARGETFLAGS)
+#LD2FLAGS_ODINCRT = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /nodebug      $(LD2TARGETFLAGS)
+
+!ifdef NODEBUGINFO
+LDFLAGS          = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /exepack:2 /Nod" $(LDTARGETFLAGS) -s
+LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /exepack:2     " $(LDTARGETFLAGS) -s
+LD2FLAGS         = -Zmap -s $(LD2TARGETFLAGS)
 LD2FLAGS_ODINCRT = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /nodebug      $(LD2TARGETFLAGS)
+LD2FLAGS_ODINCRT         = -Zmap -s $(LD2TARGETFLAGS)
+
+!else
+LDFLAGS          = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /exepack:2 /Nod" $(LDTARGETFLAGS) -g
+LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /exepack:2     " $(LDTARGETFLAGS) -g
+LD2FLAGS         = -Zomf -Zmap -Zhigh-mem $(LD2TARGETFLAGS)
+LD2FLAGS_ODINCRT = -Zomf -Zmap -Zhigh-mem $(LD2TARGETFLAGS)
+!endif
                                                 

trunk/include/win/winuser.h

@@ -442 +442 @@
 #define OCR_ICOCUR          32647
 #define OCR_NO              32648
+#define OCR_HAND            32649
 #define OCR_APPSTARTING     32650
 #define OCR_HELP            32651  /* only defined in wine */