PLAIN_API_ONLY compatibility

c-smile · Oct 29, 2016 · 664d51c · 664d51c
1 parent 4c89378
commit 664d51c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/include/sciter-x-api.h b/include/sciter-x-api.h
@@ -245,10 +245,10 @@ typedef struct _ISciterAPI {
   LPSciterGraphicsAPI SCFN( GetSciterGraphicsAPI )();
   LPSciterRequestAPI SCFN( GetSciterRequestAPI )();
 
-#ifdef WINDOWS
-  BOOL SCFN( SciterCreateOnDirectXWindow ) (HWINDOW hwnd, IDXGISwapChain* pSwapChain);
-  BOOL SCFN( SciterRenderOnDirectXWindow ) (HWINDOW hwnd, HELEMENT elementToRenderOrNull, BOOL frontLayer);
-  BOOL SCFN( SciterRenderOnDirectXTexture ) (HWINDOW hwnd, HELEMENT elementToRenderOrNull, IDXGISurface* surface);
+#ifdef WINDOWS 
+    BOOL SCFN( SciterCreateOnDirectXWindow ) (HWINDOW hwnd, IUnknown* pSwapChain); // IDXGISwapChain
+    BOOL SCFN( SciterRenderOnDirectXWindow ) (HWINDOW hwnd, HELEMENT elementToRenderOrNull, BOOL frontLayer);
+    BOOL SCFN( SciterRenderOnDirectXTexture ) (HWINDOW hwnd, HELEMENT elementToRenderOrNull, IUnknown* surface); // IDXGISurface
 #endif
 
 
@@ -292,7 +292,7 @@ typedef ISciterAPI* (SCAPI *SciterAPI_ptr)();
             SciterAPI_ptr sciterAPI = (SciterAPI_ptr) GetProcAddress(hm, "SciterAPI");
             if( sciterAPI ) {
               _api = sciterAPI();
-#if defined(__cplusplus)
+#if defined(__cplusplus) && !defined(PLAIN_API_ONLY)
               tiscript::ni( _api->TIScriptAPI() );
 #endif
             } else {
@@ -604,9 +604,9 @@ typedef ISciterAPI* (SCAPI *SciterAPI_ptr)();
   inline BOOL SCAPI Sciter_V2v(HVM vm, const VALUE* value, tiscript_value* out_script_value) { return SAPI()->Sciter_V2v(vm,value,out_script_value); }
 
 #ifdef WINDOWS
-  inline BOOL SCAPI SciterCreateOnDirectXWindow(HWINDOW hwnd, IDXGISwapChain* pSwapChain) { return SAPI()->SciterCreateOnDirectXWindow(hwnd,pSwapChain); }
+  inline BOOL SCAPI SciterCreateOnDirectXWindow(HWINDOW hwnd, IUnknown* pSwapChain) { return SAPI()->SciterCreateOnDirectXWindow(hwnd,pSwapChain); }
   inline BOOL SCAPI SciterRenderOnDirectXWindow(HWINDOW hwnd, HELEMENT elementToRenderOrNull, BOOL frontLayer) { return SAPI()->SciterRenderOnDirectXWindow(hwnd,elementToRenderOrNull,frontLayer); }
-  inline BOOL SCAPI SciterRenderOnDirectXTexture(HWINDOW hwnd, HELEMENT elementToRenderOrNull, IDXGISurface* surface) { return SAPI()->SciterRenderOnDirectXTexture(hwnd,elementToRenderOrNull,surface); }
+  inline BOOL SCAPI SciterRenderOnDirectXTexture(HWINDOW hwnd, HELEMENT elementToRenderOrNull, IUnknown* surface) { return SAPI()->SciterRenderOnDirectXTexture(hwnd,elementToRenderOrNull,surface); }
 #endif
 
 

diff --git a/include/sciter-x-def.h b/include/sciter-x-def.h
@@ -266,7 +266,7 @@ typedef SCN_GRAPHICS_CRITICAL_FAILURE* LPSCN_GRAPHICS_CRITICAL_FAILURE;
  * \param[in] uri \b LPCWSTR, URI of the data requested by Sciter.
  * \param[in] data \b LPBYTE, pointer to data buffer.
  * \param[in] dataLength \b UINT, length of the data in bytes.
- * \param[in] requestId \b LPVOID, SCN_LOAD_DATA requestId, can ne NULL.
+ * \param[in] requestId \b LPVOID, SCN_LOAD_DATA requestId, can be NULL.
  * \return \b BOOL, TRUE if Sciter accepts the data or \c FALSE if error occured
  **/
 
@@ -506,7 +506,7 @@ typedef VOID SC_CALLBACK URL_DATA_RECEIVER( const URL_DATA* pUrlData, LPVOID par
 *
 **/
 
-BOOL SCAPI SciterCreateOnDirectXWindow(HWINDOW hwnd, IDXGISwapChain* pSwapChain);
+BOOL SCAPI SciterCreateOnDirectXWindow(HWINDOW hwnd, IUnknown* pSwapChain); // IDXGISwapChain
 
 /**Renders content of the document loaded into the window
 * Optionally allows to render parts of document (separate DOM elements) as layers
@@ -528,7 +528,7 @@ BOOL SCAPI SciterRenderOnDirectXWindow(HWINDOW hwnd, HELEMENT elementToRenderOrN
 * \return \b BOOL, \c TRUE if layer was rendered successfully.
 *
 **/
-BOOL SCAPI SciterRenderOnDirectXTexture(HWINDOW hwnd, HELEMENT elementToRenderOrNull, IDXGISurface* surface);
+BOOL SCAPI SciterRenderOnDirectXTexture(HWINDOW hwnd, HELEMENT elementToRenderOrNull, IUnknown* surface); // IDXGISurface
 
 
 /**Render document to ID2D1RenderTarget

diff --git a/include/tiscript.hpp b/include/tiscript.hpp
@@ -4,7 +4,7 @@
 #include <assert.h>
 #include "tiscript.h"
 
-#if defined(__cplusplus)
+#if defined(__cplusplus) && !defined(PLAIN_API_ONLY)
 
 #include "tiscript-streams.hpp"
 

diff --git a/include/value.h b/include/value.h
@@ -298,7 +298,7 @@ UINT SCAPI ValueNativeFunctorSet( VALUE* pval,
 BOOL SCAPI ValueIsNativeFunctor( const VALUE* pval);
 
 
-#if defined(__cplusplus) && !defined(__value_hpp__)
+#if defined(__cplusplus) && !defined(__value_hpp__) && !defined(PLAIN_API_ONLY)
 
   #include "value.hpp"