Changeset 18137 in vbox for trunk/src

Timestamp:

Mar 23, 2009 1:22:03 PM (16 years ago)

Author:

vboxsync

Message:

CBinding: removed the deprecated tstLinuxC testcase and made the functions static wherever possible in VBoxXPCOMC.cpp

Location:

trunk/src/VBox/Main/cbinding

Files:

trunk/src/VBox/Main/cbinding/Makefile.kmk

-              r17793
+              r18137
         $(INST_SDK)bindings/xpcom/cbinding/samples/
 XpComCSamples_SOURCES = \
-        tstLinuxC.c \
         tstXPCOMCGlue.c \
         makefile.tstLinuxC=>Makefile
+        makefile.tstXPCOMCGlue=>Makefile
 INSTALLS += XpComCGlue
 …
+  #
   # The testcase (also in samples).
+  #
-  PROGRAMS += tstXPCOMC
-  tstXPCOMC_TEMPLATE = VBOXR3EXE
-  tstXPCOMC_INCS = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include
-  tstXPCOMC_INTERMEDIATES = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v2_2.h
-  tstXPCOMC_SOURCES = \
-        tstLinuxC.c
-  tstXPCOMC_LIBS = \
-        $(VBoxXPCOMC_1_TARGET)
+  #
   # C testcase using the dynamic glue.
+  #

r17837	r18137
40	40	static nsIComponentManager *manager;
41	41
42		void VBoxComUninitialize(void);
	42	static void VBoxComUninitialize(void);
43	43
44		int
	44	static int
45	45	VBoxUtf16ToUtf8(const PRUnichar pwszString, char *ppszString)
46	46	{
…	…
48	48	}
49	49
50		int
	50	static int
51	51	VBoxUtf8ToUtf16(const char pszString, PRUnichar *ppwszString)
52	52	{
…	…
54	54	}
55	55
56		void
	56	static void
57	57	VBoxUtf16Free(PRUnichar *pwszString)
58	58	{
…	…
60	60	}
61	61
62		void
	62	static void
63	63	VBoxUtf8Free(char *pszString)
64	64	{
…	…
66	66	}
67	67
68		void
	68	static void
69	69	VBoxComUnallocMem(void *ptr)
70	70	{
…	…
75	75	}
76	76
77		void
	77	static void
78	78	VBoxComInitialize(IVirtualBox virtualBox, ISession session)
79	79	{
…	…
129	129	}
130	130
131		void
	131	static void
132	132	VBoxComUninitialize(void)
133	133	{
…	…
144	144	}
145	145
146		uint32_t
	146	static uint32_t
147	147	VBoxVersion(void)
148	148	{

-              r18126
+              r18137
+#
-PATH_BIN      = /opt/VirtualBox
 INCS_XPCOM    = -I../../include
 GLUE_DIR      = ..
 GLUE_INC      = -I..
-LDFLAGS       = -Xlinker -rpath -Xlinker $(PATH_BIN)
 CC            = gcc
 CFLAGS        = -g -Wall
 .PHONY: all
 all: tstLinuxC tstXPCOMCGlue
+all: tstXPCOMCGlue
 .PHONY: clean
 clean:
+        rm -f tstLinuxC.o tstLinuxC tstXPCOMCGlue.o tstXPCOMCGlue VBoxXPCOMCGlue.o
+tstLinuxC: tstLinuxC.o
+        $(CC) -o $@ $^ $(LDFLAGS) $(PATH_BIN)/VBoxXPCOMC.so
+tstLinuxC.o: tstLinuxC.c
+        $(CC) $(CFLAGS) $(INCS_XPCOM) -o $@ -c $<
+        rm -f tstXPCOMCGlue.o tstXPCOMCGlue VBoxXPCOMCGlue.o
 tstXPCOMCGlue: tstXPCOMCGlue.o VBoxXPCOMCGlue.o

Note: See TracChangeset for help on using the changeset viewer.