Reworked installation instructions.
This commit is contained in:
@@ -29,6 +29,18 @@ else: # for Linux
|
||||
|
||||
when STATIC_LINK_GLFW: # GLFW static link
|
||||
switch "define","glfwStaticLib"
|
||||
when defined(windows):
|
||||
discard # Windows-specific handling if needed
|
||||
else: # Linux
|
||||
switch "passL","-lglfw"
|
||||
switch "passL","-lX11"
|
||||
switch "passL","-lXrandr"
|
||||
switch "passL","-lXinerama"
|
||||
switch "passL","-lXcursor"
|
||||
switch "passL","-lXi"
|
||||
switch "passL","-lpthread"
|
||||
switch "passL","-ldl"
|
||||
switch "passL","-lm"
|
||||
else: # shared/dll
|
||||
when defined(windows):
|
||||
if TC == "vcc":
|
||||
@@ -39,6 +51,8 @@ else: # shared/dll
|
||||
#switch "define","cimguiDLL"
|
||||
else:
|
||||
switch "passL","-lglfw"
|
||||
# Add X11 libs for shared linking too
|
||||
switch "passL","-lX11"
|
||||
|
||||
when STATIC_LINK_CC: # gcc static link
|
||||
case TC
|
||||
@@ -75,4 +89,5 @@ case TC
|
||||
of "clang":
|
||||
switch "cc.exe","clang"
|
||||
switch "cc.linkerexe","clang"
|
||||
switch "cc",TC
|
||||
switch "cc",TC
|
||||
|
||||
|
||||
@@ -123,12 +123,12 @@ proc main(ip: string = "localhost", port: int = 37573) =
|
||||
of CLIENT_AGENT_PAYLOAD:
|
||||
let payload = decode(event.data["payload"].getStr())
|
||||
try:
|
||||
let outFilePath = fmt"{CONQUEST_ROOT}/bin/monarch.x64.exe"
|
||||
let path = fmt"{CONQUEST_ROOT}/bin/monarch.x64.exe"
|
||||
|
||||
# TODO: Using native file dialogs to have the client select the output file path (does not work in WSL)
|
||||
# let outFilePath = callDialogFileSave("Save Payload")
|
||||
# let path = callDialogFileSave("Save Payload")
|
||||
|
||||
writeFile(outFilePath, payload)
|
||||
writeFile(path, payload)
|
||||
except IOError:
|
||||
discard
|
||||
|
||||
|
||||
@@ -25,13 +25,13 @@ when defined(windows):
|
||||
("segoeui.ttf", "Seoge UI", 14.4),
|
||||
]
|
||||
)
|
||||
else: # For Debian/Ubuntu/Mint
|
||||
else: # Linux
|
||||
const
|
||||
fontInfo = TFontInfo(
|
||||
osRootDir: "/",
|
||||
fontDir: "usr/share/fonts",
|
||||
fontTable: @[
|
||||
("truetype/noto/NotoSansMono-Regular.ttf", "Noto Sans Mono", 20.0)
|
||||
("truetype/noto/NotoSansMono-Regular.ttf", "Noto Sans Mono", 14.4)
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import strformat, strutils, times, os, tables
|
||||
import strformat, strutils, times, os, tables # native_dialogs
|
||||
import imguin/[cimgui, glfw_opengl, simple]
|
||||
import ../../utils/[appImGui, colors]
|
||||
import ../../../common/[types, utils]
|
||||
@@ -96,8 +96,11 @@ proc draw*(component: DownloadsComponent, showComponent: ptr bool, connection: W
|
||||
if igMenuItem("Download", nil, false, true):
|
||||
# Download file
|
||||
try:
|
||||
# TODO: Use native dialogs to select the download location
|
||||
let path = item.path & ".download"
|
||||
|
||||
# TODO: Use native dialogs to select the download location
|
||||
# let path = callDialogFileSave("Save File")
|
||||
|
||||
let data = component.contents[item.lootId]
|
||||
writeFile(path, data)
|
||||
except IOError:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import strformat, strutils, times, os, tables
|
||||
import strformat, strutils, times, os, tables # native_dialogs
|
||||
import imguin/[cimgui, glfw_opengl, simple]
|
||||
import ../../utils/[appImGui, colors]
|
||||
import ../../../common/[types, utils]
|
||||
@@ -104,8 +104,11 @@ proc draw*(component: ScreenshotsComponent, showComponent: ptr bool, connection:
|
||||
if igMenuItem("Download", nil, false, true):
|
||||
# Download screenshot
|
||||
try:
|
||||
# TODO: Use native dialogs to select the download location
|
||||
let path = item.path & "_download.jpeg"
|
||||
|
||||
# TODO: Use native dialogs to select the download location
|
||||
# let path = callDialogFileSave("Save File")
|
||||
|
||||
let data = component.textures[item.lootId].data
|
||||
writeFile(path, data)
|
||||
except IOError:
|
||||
|
||||
@@ -169,7 +169,7 @@ proc draw*(component: AgentModalComponent, listeners: seq[UIListener]): AgentBui
|
||||
component.killDate = killDate
|
||||
|
||||
# Working hours
|
||||
igText("Working Hours: ")
|
||||
igText("Working hours: ")
|
||||
igSameLine(0.0f, textSpacing)
|
||||
igCheckbox("##InputWorkingHours", addr component.workingHoursEnabled)
|
||||
igSameLine(0.0f, textSpacing)
|
||||
|
||||
Reference in New Issue
Block a user