diff options
| author | Jan Jezabek <jezabek@poczta.onet.pl> | 2008-08-13 18:28:53 +0000 |
|---|---|---|
| committer | Jan Jezabek <jezabek@poczta.onet.pl> | 2008-08-13 18:28:53 +0000 |
| commit | 607dc75d3501a4fa02d1a771e4066073a7a866ae (patch) | |
| tree | 1a23e9bde5c648c909a68ecbbc46e7a8a0a1e772 | |
| parent | 4ad2eed0a872c26bd7cd486979b7c8161ee9a0dc (diff) | |
| download | swig-607dc75d3501a4fa02d1a771e4066073a7a866ae.tar.gz | |
Fixed test-suite support for resource compiler from Platform SDK (rc.exe). Fixed syntax for specifying output file in the MSVC compiler. Interfaces generated for opaque classes now explicitly inherit from IUnknown - MIDL would generate incorrect headers otherwise.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-jezabek@10757 626c5289-ae23-0410-ae9c-e8d60b6d4f22
| -rw-r--r-- | Examples/Makefile.in | 6 | ||||
| -rw-r--r-- | Source/Modules/com.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 8b00987b5..798ab7111 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1120,15 +1120,15 @@ COM_EXEC_SUFFIX = @COM_EXEC_SUFFIX@ com: $(SRCS) $(SWIG) -com $(SWIGOPT) $(INTERFACE) $(COMPILETOOL) $(COM_IDL) $(COM_IDL_COMMON_SWITCHES) $(COM_IDL_TLB_SWITCHES) $(COM_TLB_FILE) $(COM_IDL_FILE) - $(COMPILETOOL) $(COM_RC) $(COM_RC_IN_SWITCHES) $(COM_RC_FILE) $(COM_RC_OUT_SWITCHES) $(COM_RES_FILE) + $(COMPILETOOL) $(COM_RC) $(COM_RC_OUT_SWITCHES) $(COM_RES_FILE) $(COM_RC_IN_SWITCHES) $(COM_RC_FILE) $(COMPILETOOL) $(COM_CC) $(COM_CC_SHARED_SWITCHES) $(COM_CC_OUT_SWITCHES)$(TARGET).dll$(COM_EXEC_SUFFIX) $(SRCS) $(ISRCS) $(COM_RES_FILE) $(COM_DEF_FILE) $(COM_LIBS) $(INCLUDES) com_cpp: $(SRCS) $(SWIG) -com -c++ $(SWIGOPT) $(INTERFACE) $(COMPILETOOL) $(COM_IDL) $(COM_IDL_COMMON_SWITCHES) $(COM_IDL_TLB_SWITCHES) $(COM_TLB_FILE) $(COM_IDL_FILE) - $(COMPILETOOL) $(COM_RC) $(COM_RC_IN_SWITCHES) $(COM_RC_FILE) $(COM_RC_OUT_SWITCHES) $(COM_RES_FILE) + $(COMPILETOOL) $(COM_RC) $(COM_RC_OUT_SWITCHES) $(COM_RES_FILE) $(COM_RC_IN_SWITCHES) $(COM_RC_FILE) $(COMPILETOOL) $(COM_CXX) $(COM_CXX_SHARED_SWITCHES) $(COM_CXX_OUT_SWITCHES)$(TARGET).dll$(COM_EXEC_SUFFIX) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(COM_RES_FILE) $(COM_DEF_FILE) $(COM_LIBS) $(INCLUDES) com_compile: $(SRCS) - $(COMPILETOOL) $(COM_CC) $(COM_CC_SWITCHES) $(COM_CC_OUT_SWITCHES) $(TARGET)$(COM_EXEC_SUFFIX) $(COMSRCS) $(COM_LIBS) + $(COMPILETOOL) $(COM_CC) $(COM_CC_SWITCHES) $(COM_CC_OUT_SWITCHES)$(TARGET)$(COM_EXEC_SUFFIX) $(COMSRCS) $(COM_LIBS) diff --git a/Source/Modules/com.cxx b/Source/Modules/com.cxx index fe74a52ac..26e75703e 100644 --- a/Source/Modules/com.cxx +++ b/Source/Modules/com.cxx @@ -1998,7 +1998,7 @@ public: Printv(proxy_class_def, " [\n object,\n local,\n uuid(", NIL); formatGUID(proxy_class_def, proxy_iid, false); - Printv(proxy_class_def, ")\n ]\n interface I$comclassname {\n };\n\n", NIL); + Printv(proxy_class_def, ")\n ]\n interface I$comclassname : IUnknown {\n };\n\n", NIL); Replaceall(proxy_class_forward_def, "$comclassname", classname); Replaceall(proxy_class_def, "$comclassname", classname); |