X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98d689e4030141723e076ea01a083407d78dbde5..e0dec8753abaf97e006ea1185bfb6775b28df0a8:/samples/webview/makefile.wat?ds=sidebyside

diff --git a/samples/webview/makefile.wat b/samples/webview/makefile.wat
index b97da590d8..3890469f49 100644
--- a/samples/webview/makefile.wat
+++ b/samples/webview/makefile.wat
@@ -38,6 +38,10 @@ PORTNAME = base
 !ifeq USE_GUI 1
 PORTNAME = msw
 !endif
+COMPILER_VERSION =
+!ifeq OFFICIAL_BUILD 1
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
 WXDEBUGFLAG = d
@@ -66,7 +70,7 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = 
 !endif
 !ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =  
+EXTRALIBS_FOR_BASE =   
 !endif
 __DEBUGINFO_0 =
 !ifeq BUILD debug
@@ -139,9 +143,11 @@ __EXCEPTIONSFLAG_8 = -xs
 !endif
 __WXLIB_WEBVIEW_p =
 !ifeq MONOLITHIC 0
+!ifeq USE_WEBVIEW 1
 __WXLIB_WEBVIEW_p = &
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
 !endif
+!endif
 __WXLIB_STC_p =
 !ifeq MONOLITHIC 0
 __WXLIB_STC_p = &
@@ -232,8 +238,9 @@ __DLLFLAG_p = -dWXUSINGDLL
 WX_RELEASE_NODOT = 29
 COMPILER_PREFIX = wat
 OBJS = &
-	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = &
+	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WEBVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &