Imported Upstream version 3.2.2-dfsgupstream/3.2.2-dfsg

1 files changed, 44 insertions, 3 deletions

diff --git a/Makefile.kmk b/Makefile.kmk
index e64c20e86..1ee933d2c 100644
--- a/Makefile.kmk
+++ b/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 29079 2010-05-05 13:19:35Z vboxsync $
+# $Id: Makefile.kmk 29933 2010-06-01 01:40:46Z vboxsync $
 ## @file
 # Top level makefile.
 #
@@ -1118,6 +1118,7 @@ incs:
 vslick.h: include/VBox/cdefs.h include/iprt/cdefs.h $(MAKEFILE)
 	$(RM) -f -- $@ $@.tmp $@.tmp2 $@.tmp3
 	$(APPEND) $@.tmp '// autogenerated'
+	@$(APPEND) $@.tmp '#define IN_SLICKEDIT '
 	@$(APPEND) $@.tmp '#define RT_C_DECLS_BEGIN '
 	@$(APPEND) $@.tmp '#define RT_C_DECLS_END '
 	@$(APPEND) $@.tmp '#define RT_NO_THROW '
@@ -1132,8 +1133,8 @@ vslick.h: include/VBox/cdefs.h include/iprt/cdefs.h $(MAKEFILE)
 	@$(APPEND) $@.tmp '#define END_COM_MAP(a) '
 
 	@$(APPEND) $@.tmp '#define COM_DECL_READONLY_ENUM_AND_COLLECTION(a) '
-	@$(APPEND) $@.tmp '#define COMGETTER(n)                    Get##n '
-	@$(APPEND) $@.tmp '#define COMSETTER(n)                    Set##n '
+	@$(APPEND) $@.tmp '#define COMGETTER(n)                    n '
+	@$(APPEND) $@.tmp '#define COMSETTER(n)                    n '
 	@$(APPEND) $@.tmp '#define ComSafeArrayIn(t,a)             t a[] '
 	@$(APPEND) $@.tmp '#define ComSafeArrayOut(t,a)            t * a[] '
 	@$(APPEND) $@.tmp '#define DECLARE_CLASSFACTORY(a) '
@@ -1192,6 +1193,44 @@ endif
 	@$(APPEND) $@.tmp '#define VBOX_WITH_HGCM                  1'
 	@$(APPEND) $@.tmp '#define VBOXCALL'
 
+	@$(APPEND) $@.tmp '#define PGM_CTX(a,b)                    b'
+	@$(APPEND) $@.tmp '#define PGM_CTX3(a,b,c)                 c'
+	@$(APPEND) $@.tmp '#define PGM_GST_NAME(name)              PGM_GST_NAME_AMD64(name)'
+	@$(APPEND) $@.tmp '#define PGM_GST_NAME_REAL(name)         PGM_CTX3(name)'
+	@$(APPEND) $@.tmp '#define PGM_GST_NAME_PROT(name)         PGM_CTX3(pgm,GstProt,name)'
+	@$(APPEND) $@.tmp '#define PGM_GST_NAME_32BIT(name)        PGM_CTX3(pgm,Gst32Bit,name)'
+	@$(APPEND) $@.tmp '#define PGM_GST_NAME_PAE(name)          PGM_CTX3(pgm,GstPAE,name)'
+	@$(APPEND) $@.tmp '#define PGM_GST_NAME_AMD64(name)        PGM_CTX3(pgm,GstAMD64,name)'
+	@$(APPEND) $@.tmp '#define PGM_GST_DECL(type, name)        type PGM_GST_NAME(name)'
+	@$(APPEND) $@.tmp '#define PGM_SHW_NAME(name)              PGM_GST_NAME_AMD64(name)'
+	@$(APPEND) $@.tmp '#define PGM_SHW_NAME_32BIT(name)        PGM_CTX3(pgm,Shw32Bit,name)'
+	@$(APPEND) $@.tmp '#define PGM_SHW_NAME_PAE(name)          PGM_CTX3(pgm,ShwPAE,name)'
+	@$(APPEND) $@.tmp '#define PGM_SHW_NAME_AMD64(name)        PGM_CTX3(pgm,ShwAMD64,name)'
+	@$(APPEND) $@.tmp '#define PGM_SHW_NAME_NESTED(name)       PGM_CTX3(pgm,ShwNested,name)'
+	@$(APPEND) $@.tmp '#define PGM_SHW_NAME_EPT(name)          PGM_CTX3(pgm,ShwEPT,name)'
+	@$(APPEND) $@.tmp '#define PGM_SHW_DECL(type, name)        type PGM_SHW_NAME(name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME(name)              PGM_BTH_NAME_NESTED_AMD64(name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_32BIT_REAL(name)   PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_32BIT_PROT(name)   PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_32BIT_32BIT(name)  PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_PAE_REAL(name)     PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_PAE_PROT(name)     PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_PAE_32BIT(name)    PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_PAE_PAE(name)      PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_AMD64_PROT(name)   PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_AMD64_AMD64(name)  PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_NESTED_REAL(name)  PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_NESTED_PROT(name)  PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_NESTED_32BIT(name) PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_NESTED_PAE(name)   PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_NESTED_AMD64(name) PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_EPT_REAL(name)     PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_EPT_PROT(name)     PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_EPT_32BIT(name)    PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_EPT_PAE(name)      PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_EPT_AMD64(name)    PGM_CTX3(pgm,Bth,name)'
+	@$(APPEND) $@.tmp '#define PGM_BTH_DECL(type, name)        type PGM_BTH_NAME(name)'
+
 	$(SED)  -e '/__cdecl/d' \
 		-e '/^ *# *define.*DECL/!d' \
 		-e '/DECLS/d' \
@@ -1225,6 +1264,8 @@ endif
 	$(RM) -f $@.tmp $@.tmp2 $@.tmp3
 ifeq ($(KBUILD_HOST),win)
 	@$(ECHO) 'TODO: Merge vslick.h with your "$(HOMEDRIVE)$(HOMEPATH)\Documents\My SlickEdit Config\x.y.z\usercpp.h" file.'
+else ifeq ($(KBUILD_HOST),darwin)
+	@$(ECHO) "TODO: Merge ./vslick.h with your ~/Library/Application\ Support/SlickEdit/x.y.z/unxcpp.h file."
 else
 	@$(ECHO) "TODO: Merge ./vslick.h with your ~/.slickedit/x.y.z/unxcpp.h file."
 endif