[ros-diffs] [tkreuzer] 50720: [KSPROXY] - Fix gcc build - don't pass gcc flags to msvc . mark some exports as private

Author: tkreuzer
Date: Tue Feb 15 20:47:09 2011
New Revision: 50720

URL: http://svn.reactos.org/svn/reactos?rev=50720&view=rev
Log:
[KSPROXY]
- Fix gcc build
- don't pass gcc flags to msvc
. mark some exports as private

Modified:
    branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt
    branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp
    branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp
    branches/cmake-bringup/dll/directx/ksproxy/ksproxy.spec

Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro…
==============================================================================
--- branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Tue Feb 15
20:47:09 2011
@@ -36,11 +36,10 @@
 else()
     #FIXME : can't build if this is enabled, check if this is needed
     #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions
-fno-rtti")
+    target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 -lcoldname)
 endif(MSVC)
 
-target_link_libraries(ksproxy 
-    stlport -lsupc++ -lgcc -lmingw32 -lcoldname
-    strmiids)
+target_link_libraries(ksproxy stlport  strmiids)
     
 add_importlibs(ksproxy
     advapi32

Modified: branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro…
==============================================================================
--- branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp [iso-8859-1] Tue Feb 15
20:47:09 2011
@@ -11,9 +11,10 @@
 /* FIXME guid mess */
 #ifndef _MSC_VER
 const GUID IID_IUnknown           = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x46}};
+#else
+const GUID IID_IKsDataTypeHandler = {0x5FFBAA02L, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00,
0xAA, 0x00, 0xA2, 0x16, 0xA1}};
 #endif
 const GUID IID_IClassFactory      = {0x00000001, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x46}};
-const GUID IID_IKsDataTypeHandler = {0x5FFBAA02L, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00,
0xAA, 0x00, 0xA2, 0x16, 0xA1}};
 
 class CKsDataTypeHandler : public IKsDataTypeHandler
 {

Modified: branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro…
==============================================================================
--- branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp [iso-8859-1] Tue Feb 15
20:47:09 2011
@@ -10,9 +10,10 @@
 
 const GUID IID_IKsPinPipe = {0xe539cd90, 0xa8b4, 0x11d1, {0x81, 0x89, 0x00, 0xa0, 0xc9,
0x06, 0x28, 0x02}};
 const GUID IID_IKsPinEx   = {0x7bb38260L, 0xd19c, 0x11d2, {0xb3, 0x8a, 0x00, 0xa0, 0xc9,
0x5e, 0xc2, 0x2e}};
+#ifdef _MSC_VER
 const GUID IID_IKsPin =     {0xb61178d1L, 0xa2d9, 0x11cf, {0x9e, 0x53, 0x00, 0xaa, 0x00,
0xa2, 0x16, 0xa1}};
 const GUID IID_IKsInterfaceHandler = {0xD3ABC7E0L, 0x9A61, 0x11D0, {0xA4, 0x0D, 0x00,
0xA0, 0xC9, 0x22, 0x31, 0x96}};
-
+#endif
 #ifndef _MSC_VER
 
 const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28,
0xDB, 0x04, 0xC1, 0x00, 0x00}};

Modified: branches/cmake-bringup/dll/directx/ksproxy/ksproxy.spec
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro…
==============================================================================
--- branches/cmake-bringup/dll/directx/ksproxy/ksproxy.spec [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/ksproxy/ksproxy.spec [iso-8859-1] Tue Feb 15
20:47:09 2011
@@ -1,7 +1,7 @@
-@ stdcall DllCanUnloadNow()
-@ stdcall DllGetClassObject(ptr ptr ptr)
-@ stdcall DllRegisterServer()
-@ stdcall DllUnregisterServer()
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()
 @ stdcall KsGetMediaType(long ptr ptr long)
 @ stdcall KsGetMediaTypeCount(ptr long ptr)
 @ stdcall KsGetMultiplePinFactoryItems(ptr long long ptr)