Freevgui

vgui_int.cpp

@@ -57,7 +57,7 @@ static void VGui_Startup( int width, int height )
 	rootpanel->setPaintBorderEnabled( false );
 	rootpanel->setPaintBackgroundEnabled( false );
 	rootpanel->setVisible( true );
-	rootpanel->setCursor( new Cursor( Cursor::dc_none ));
+	rootpanel->setCursor( new Cursor( Cursor::DC_NONE ));
 
 	staticApp.start();
 	staticApp.setMinimumTickMillisInterval( 0 );

vgui_main.h

@@ -35,15 +35,13 @@ from your version.
 
 #include "vgui_api.h"
 
-#include<VGUI.h>
-#include<VGUI_App.h>
-#include<VGUI_Font.h>
-#include<VGUI_Panel.h>
-#include<VGUI_Cursor.h>
-#include<VGUI_SurfaceBase.h>
-#include<VGUI_InputSignal.h>
-#include<VGUI_MouseCode.h>
-#include<VGUI_KeyCode.h>
+#include <vgui.h>
+#include <app.h>
+#include <font.h>
+#include <panel.h>
+#include <input.h>
+#include <surface.h>
+#include <signals.h>
 
 namespace vgui_support
 {

vgui_surf.cpp

@@ -67,7 +67,7 @@ CEngineSurface :: CEngineSurface( Panel *embeddedPanel ):SurfaceBase( embeddedPa
 	//_surfaceExtents[3] = menu.globals->scrHeight;
 	embeddedPanel->getSize(_surfaceExtents[2], _surfaceExtents[3]);
 	_drawTextPos[0] = _drawTextPos[1] = 0;
-	_hCurrentCursor = null;
+	_hCurrentCursor = NULL;
 
 	staticFont = NULL;
 	staticFontInfo = NULL;

wscript

@@ -3,21 +3,18 @@
 # mittorn, 2018
 
 def options(opt):
-	opt.load('vgui')
+	pass
 
 def configure(conf):
-	conf.load('vgui')
-	conf.env.NO_VGUI = not conf.check_vgui()
+	pass
 
 def build(bld):
-	if bld.env.NO_VGUI:
-		return
-
 	bld.shlib(
 		source   = bld.path.ant_glob(['*.cpp']),
 		target   = 'vgui_support',
+		features = 'fix_freevgui_link',
 		includes = '.',
-		use      = 'sdk_includes werror DL M VGUI yy_thunks',
+		use      = 'sdk_includes werror DL M vgui yy_thunks',
 		rpath    = bld.env.DEFAULT_RPATH,
 		install_path = bld.env.LIBDIR
 	)