update windows icon and hide black console

oclip · Sep 5, 2019 · c533aad · c533aad
1 parent 792ff75
commit c533aad
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 454 deletions.
diff --git a/3rd/lclipboard b/3rd/lclipboard
diff --git a/3rd/ltray b/3rd/ltray
diff --git a/platform/win/makefile b/platform/win/makefile
@@ -14,6 +14,7 @@ DEF= /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" \
 OPENSSL_LIB_PATH=$(OPENSSL_PATH)\lib
 CFLAGS=$(LUA_INC) /c /O2 /Ot /MT /W3 /nologo $(DEF)
 LDFLAGS= /NOLOGO \
+    /SUBSYSTEM:windows /ENTRY:mainCRTStartup \
     /LIBPATH:"$(LUA_LIB_PATH)" $(LUA_LIB) \
     /LIBPATH:"$(OPENSSL_LIB_PATH)" \
     user32.lib shell32.lib ws2_32.lib \
@@ -44,12 +45,18 @@ copas\limit.lua \
 copas\smtp.lua \
 oclip\cacert.lua \
 oclip\cafile.lua \
+oclip\clipboard_helper.lua \
+oclip\clipboard_linux.lua \
 oclip\config.lua \
+oclip\genicon.lua \
+oclip\icon.lua \
+oclip\icon_bytes.lua \
 oclip\main.lua \
+oclip\oclip_cmd.lua \
 oclip\rpc.lua \
 oclip\tools.lua \
-oclip\icon.lua \
-oclip\icon_bytes.lua \
+oclip\tray_helper.lua \
+oclip\tray_linux.lua \
 socket\ftp.lua \
 socket\headers.lua \
 socket\http.lua \

diff --git a/src/cacert.lua b/src/cacert.lua
@@ -1,4 +1,4 @@
-return [[
+return [[ 
 ##
 ## Bundle of CA Root Certificates
 ##
@@ -3506,4 +3506,4 @@ hcErulWuBurQB7Lcq9CClnXO0lD+mefPL5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB
 60PZ2Pierc+xYw5F9KBaLJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fq
 dBb9HxEGmpv0
 -----END CERTIFICATE-----
-]]
+]] 
diff --git a/src/icon.ico b/src/icon.ico
diff --git a/src/icon_bytes.lua b/src/icon_bytes.lua
diff --git a/src/main.lua b/src/main.lua
@@ -1,21 +1,20 @@
-local oclip_cmd = require "oclip.oclip_cmd"
+local oclip_cmd = require 'oclip.oclip_cmd'
 if oclip_cmd then
-    return
+  return
 end
 
-package.path='../share/lua/5.3/?.lua;?.lua;;'
-package.cpath='../lib/lua/5.3/?.so;;'
+package.path = '../share/lua/5.3/?.lua;?.lua;;'
+package.cpath = '../lib/lua/5.3/?.so;?.dll;'
 
 local copas = require 'copas'
-local ws = require('websocket')
+local ws = require 'websocket'
 local ws_client = ws.client.copas({timeout = 5})
 local rpc = require 'oclip.rpc'
 local cfg = require 'oclip.config'
 local cafile = require 'oclip.cafile'
 local icon = require 'oclip.icon'
 local tools = require 'oclip.tools'
 
-
 local handler
 
 local function traceback(msg)

diff --git a/src/tools.lua b/src/tools.lua
@@ -106,7 +106,7 @@ local function unset_auto_startup()
   os.remove(link_file_name)
 end
 
-function _M.open_config()
+local function open_config()
   local fpath = cfg.get_config_file_path()
   local vbs_str = string.format([[Set oShell = CreateObject("WScript.Shell")
 oShell.Run "notepad %s", 1]], fpath)
@@ -135,7 +135,7 @@ end
 
 local function cb_open_config()
   print('open config file')
-  tools.open_config()
+  open_config()
 end
 
 local function cb_exit()