diff options
| author | Alexander <alex@cogarr.net> | 2019-07-10 14:23:51 -0400 |
|---|---|---|
| committer | Alexander <alex@cogarr.net> | 2019-07-10 14:23:51 -0400 |
| commit | c9db55cdc2f69c3dc7aefabe0cc828a64e377024 (patch) | |
| tree | b6735e6b43660ea77f59654f8dd4ad1339b6f9e3 /spec/test3_spec.lua | |
| parent | 456ee9baefb343e98dc94678e05335a547786c2a (diff) | |
| parent | 6539fbff3d4ecd686676f7c0de6672de38023764 (diff) | |
| download | brokengine-c9db55cdc2f69c3dc7aefabe0cc828a64e377024.tar.gz brokengine-c9db55cdc2f69c3dc7aefabe0cc828a64e377024.tar.bz2 brokengine-c9db55cdc2f69c3dc7aefabe0cc828a64e377024.zip | |
Started work on cross-platform refactor
Started refactoring the code to work on windows and linux
Diffstat (limited to 'spec/test3_spec.lua')
| -rw-r--r-- | spec/test3_spec.lua | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/spec/test3_spec.lua b/spec/test3_spec.lua index e19741d..8861b0c 100644 --- a/spec/test3_spec.lua +++ b/spec/test3_spec.lua @@ -1,6 +1,15 @@ +local game_bin = nil +if package.config:sub(1,1) == "/" then -- linux or osx + game_bin = "bin/client/bin/brokengine_client" + server_bin = "bin/server/bin/brokengine_server" +else + game_bin = "bin\\client\\bin\\brokengine_client.exe" + server_bin = "bin\\server\\bin\\brokengine_server.exe" +end + function rungame() - f = io.popen("bin\\client\\bin\\brokengine_client.exe spec/headless","r") + f = io.popen(game_bin .. " spec/headless","r") d = f:read("*all") f:close() return d @@ -10,8 +19,8 @@ function runboth() --print("Running both") --Do we have a race condition here? (Can client start and send it's message --before the server is ready to accept? - f1 = io.popen("bin\\server\\bin\\brokengine_server.exe spec/server","r") - f2 = io.popen("bin\\client\\bin\\brokengine_client.exe spec/headless","r") + f1 = io.popen(server_bin .. " spec/server","r") + f2 = io.popen(game_bin .. " spec/headless","r") --print("Both ran...") d1 = f1:read("*all") d2 = f2:read("*all") |