Skip to content

Commit

Permalink
Updated Leviathan version (now jsvendor is from there). Fixed a typo …
Browse files Browse the repository at this point in the history
…in comment and deleted old gui file
  • Loading branch information
hhyyrylainen committed Sep 6, 2018
1 parent 716766c commit e223db2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 472 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assets/*
# asset symlinks
/Fonts
/Textures
/jsvendor
/JSVendor


# ue4 stuff
Expand Down
16 changes: 9 additions & 7 deletions SetupThrive.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def parseExtraArgs
leviathan = Leviathan.new(
# Use this if you always want the latest commit
# version: "develop",
version: "216d4d2bca1847bce276889e08370d2e0da74270",
version: "b3a58bb91507774b34045b648efbfc9bbc9e8d40",
# Doesn't actually work, but leviathan doesn't install with sudo by
# default, or install at all for that matter
noInstallSudo: true
Expand Down Expand Up @@ -119,6 +119,8 @@ def parseExtraArgs

isInteractive = $stdout.isatty

puts "Interactive mode is: " + isInteractive.to_s

if not File.exist? "assets"

info "Getting assets"
Expand Down Expand Up @@ -188,7 +190,6 @@ def parseExtraArgs

# Symlink the textures and fonts from assets to make local previewing of the GUI easier
if OS.windows?
# These need to run in cmd as admin, for some reason
info "Creating junctions for assets to be referenced from gui " +
"html without running cmake every time"
runSystemSafe "cmd", "/c", "mklink", "/J",
Expand All @@ -198,8 +199,9 @@ def parseExtraArgs
convertPathToWindows(File.join(ProjectDir, "Fonts")),
convertPathToWindows(File.join(ProjectDir, "assets", "fonts"))
runSystemSafe "cmd", "/c", "mklink", "/J",
convertPathToWindows(File.join(ProjectDir, "jsvendor")),
convertPathToWindows(File.join(ProjectDir, "assets", "jsvendor"))
convertPathToWindows(File.join(ProjectDir, "JSVendor")),
convertPathToWindows(File.join(ProjectDir, "ThirdParty/Leviathan/bin/Data",
"JSVendor"))
else
if !File.exists? File.join(ProjectDir, "Textures")
FileUtils.ln_sf File.join(ProjectDir, "assets", "textures"),
Expand All @@ -211,9 +213,9 @@ def parseExtraArgs
File.join(ProjectDir, "Fonts")
end

if !File.exists? File.join(ProjectDir, "jsvendor")
FileUtils.ln_sf File.join(ProjectDir, "assets", "jsvendor"),
File.join(ProjectDir, "jsvendor")
if !File.exists? File.join(ProjectDir, "JSVendor")
FileUtils.ln_sf File.join(ProjectDir, "ThirdParty/Leviathan/bin/Data", "JSVendor"),
File.join(ProjectDir, "JSVendor")
end
end

Expand Down
2 changes: 1 addition & 1 deletion scripts/gui/thrive_gui.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="description" content="The HTML file with all the thrive GUI stuff in it">

<link rel="stylesheet" href="thrive_style.css">
<script src="../../jsvendor/jquery-3.3.1.min.js"></script>
<script src="../../JSVendor/jquery-3.3.1.min.js"></script>
<script src="gui_common.js"></script>
<script src="main_menu.js"></script>
<script src="microbe_hud.js"></script>
Expand Down
Loading

0 comments on commit e223db2

Please sign in to comment.