Commit 5200f4a205834b9aadb79bbfc19fa47f260c9a6f

Authored by DarkGod
1 parent 633b3fe2

rename

... ... @@ -62,8 +62,8 @@ newoption {
62 62 }
63 63
64 64 newoption {
65   - trigger = "disable-awesomium",
66   - description = "Disable using awesomium embedded browser"
  65 + trigger = "web-awesomium",
  66 + description = "Use awesomium embedded browser as the webcore"
67 67 }
68 68
69 69 newoption {
... ...
... ... @@ -512,17 +512,17 @@ project "te4-bzip"
512 512
513 513 files { "../src/bzip2/*.c", }
514 514
515   -if not _OPTIONS['disable-awesomium'] and not _OPTIONS.wincross then
  515 +if _OPTIONS['web-awesomium'] and not _OPTIONS.wincross then
516 516 project "te4-web"
517 517 kind "SharedLib"
518 518 language "C++"
519 519 targetname "te4-web"
520 520
521   - libdirs {"/Test/awesomium_v1.7.2_sdk_linux64/bin/"}
522   - includedirs {"/Test/awesomium_v1.7.2_sdk_linux64/include/"}
  521 + libdirs {"/opt/awesomium/bin/"}
  522 + includedirs {"/opt/awesomium/include/"}
523 523 links { "awesomium-1-7" }
524 524
525   - files { "../src/web/*.cpp", }
  525 + files { "../src/web-awesomium/*.cpp", }
526 526 end
527 527
528 528 if _OPTIONS.steam then
... ...
... ... @@ -17,8 +17,10 @@ solution "TEngine"
17 17 "src/physfs",
18 18 "src/zlib",
19 19 "src/bzip2",
20   - "src/web",
21 20 }
  21 + if _OPTIONS['web-awesomium'] then
  22 + includedirs { "src/web-awesomium" }
  23 + end
22 24 if _OPTIONS.wincross then
23 25 includedirs {
24 26 "/usr/i686-pc-mingw32/usr/include/",
... ...
... ... @@ -8,7 +8,7 @@
8 8 extern "C" {
9 9 #include <stdio.h>
10 10 #include <stdlib.h>
11   -#include "web-external.h"
  11 +#include "../web-external.h"
12 12 }
13 13 #include "web.h"
14 14 #include "web-internal.h"
... ...
... ... @@ -28,7 +28,7 @@
28 28 #include "types.h"
29 29 #include "main.h"
30 30 #include "te4web.h"
31   -#include "web/web-external.h"
  31 +#include "web-external.h"
32 32 #include "lua_externs.h"
33 33
34 34 /*
... ...