mirror of https://github.com/PurpleI2P/i2pd.git
orignal
8 years ago
12 changed files with 311 additions and 109 deletions
@ -1,95 +1,91 @@
@@ -1,95 +1,91 @@
|
||||
UNAME := $(shell uname -s) |
||||
SHLIB := libi2pd.so |
||||
ARLIB := libi2pd.a |
||||
SHLIB_CLIENT := libi2pdclient.so |
||||
ARLIB_CLIENT := libi2pdclient.a |
||||
I2PD := i2pd |
||||
GREP := fgrep |
||||
DEPS := obj/make.dep |
||||
|
||||
include filelist.mk |
||||
|
||||
USE_AESNI := yes |
||||
USE_STATIC := no |
||||
|
||||
ifeq ($(UNAME),Darwin) |
||||
DAEMON_SRC += DaemonLinux.cpp |
||||
include Makefile.osx |
||||
else ifeq ($(shell echo $(UNAME) | $(GREP) -c FreeBSD),1) |
||||
DAEMON_SRC += DaemonLinux.cpp |
||||
include Makefile.bsd |
||||
else ifeq ($(UNAME),Linux) |
||||
DAEMON_SRC += DaemonLinux.cpp |
||||
include Makefile.linux |
||||
else # win32 mingw
|
||||
DAEMON_SRC += DaemonWin32.cpp Win32/Win32Service.cpp |
||||
WINDIR := True |
||||
include Makefile.mingw |
||||
endif |
||||
|
||||
all: mk_build_dir $(ARLIB) $(ARLIB_CLIENT) $(I2PD) |
||||
|
||||
mk_build_dir: |
||||
mkdir -p obj |
||||
ifeq ($(WINDIR),True) |
||||
mkdir -p obj/Win32 |
||||
endif |
||||
|
||||
api: mk_build_dir $(SHLIB) $(ARLIB) |
||||
api_client: mk_build_dir $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT) |
||||
|
||||
## NOTE: The NEEDED_CXXFLAGS are here so that CXXFLAGS can be specified at build time
|
||||
## **without** overwriting the CXXFLAGS which we need in order to build.
|
||||
## For example, when adding 'hardening flags' to the build
|
||||
## (e.g. -fstack-protector-strong -Wformat -Werror=format-security), we do not want to remove
|
||||
## -std=c++11. If you want to remove this variable please do so in a way that allows setting
|
||||
## custom FLAGS to work at build-time.
|
||||
|
||||
deps: |
||||
@mkdir -p obj |
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS) |
||||
@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS) |
||||
|
||||
obj/%.o : %.cpp |
||||
@mkdir -p obj |
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $< |
||||
|
||||
# '-' is 'ignore if missing' on first run
|
||||
-include $(DEPS) |
||||
|
||||
$(I2PD): $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC)) $(ARLIB) $(ARLIB_CLIENT) |
||||
$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS) |
||||
|
||||
$(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC)) |
||||
ifneq ($(USE_STATIC),yes) |
||||
$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^ |
||||
endif |
||||
|
||||
$(SHLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC)) |
||||
$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^ |
||||
|
||||
$(ARLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC)) |
||||
ar -r $@ $^ |
||||
|
||||
$(ARLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC)) |
||||
ar -r $@ $^ |
||||
|
||||
clean: |
||||
rm -rf obj |
||||
$(RM) $(I2PD) $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT) |
||||
|
||||
strip: $(I2PD) $(SHLIB_CLIENT) $(SHLIB) |
||||
strip $^ |
||||
|
||||
LATEST_TAG=$(shell git describe --tags --abbrev=0 master) |
||||
dist: |
||||
git archive --format=tar.gz -9 --worktree-attributes \
|
||||
--prefix=i2pd_$(LATEST_TAG)/ $(LATEST_TAG) -o i2pd_$(LATEST_TAG).tar.gz |
||||
|
||||
.PHONY: all |
||||
.PHONY: clean |
||||
.PHONY: deps |
||||
.PHONY: dist |
||||
.PHONY: api |
||||
.PHONY: api_client |
||||
.PHONY: mk_build_dir |
||||
UNAME := $(shell uname -s) |
||||
SHLIB := libi2pd.so |
||||
ARLIB := libi2pd.a |
||||
SHLIB_CLIENT := libi2pdclient.so |
||||
ARLIB_CLIENT := libi2pdclient.a |
||||
I2PD := i2pd |
||||
GREP := fgrep |
||||
DEPS := obj/make.dep |
||||
|
||||
include filelist.mk |
||||
|
||||
USE_AESNI := yes |
||||
USE_STATIC := no |
||||
|
||||
ifeq ($(UNAME),Darwin) |
||||
DAEMON_SRC += DaemonLinux.cpp |
||||
include Makefile.osx |
||||
else ifeq ($(shell echo $(UNAME) | $(GREP) -c FreeBSD),1) |
||||
DAEMON_SRC += DaemonLinux.cpp |
||||
include Makefile.bsd |
||||
else ifeq ($(UNAME),Linux) |
||||
DAEMON_SRC += DaemonLinux.cpp |
||||
include Makefile.linux |
||||
else # win32 mingw
|
||||
DAEMON_SRC += DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp |
||||
include Makefile.mingw |
||||
endif |
||||
|
||||
all: mk_obj_dir $(ARLIB) $(ARLIB_CLIENT) $(I2PD) |
||||
|
||||
mk_obj_dir: |
||||
@mkdir -p obj |
||||
@mkdir -p obj/Win32 |
||||
|
||||
api: mk_obj_dir $(SHLIB) $(ARLIB) |
||||
api_client: mk_obj_dir $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT) |
||||
|
||||
## NOTE: The NEEDED_CXXFLAGS are here so that CXXFLAGS can be specified at build time
|
||||
## **without** overwriting the CXXFLAGS which we need in order to build.
|
||||
## For example, when adding 'hardening flags' to the build
|
||||
## (e.g. -fstack-protector-strong -Wformat -Werror=format-security), we do not want to remove
|
||||
## -std=c++11. If you want to remove this variable please do so in a way that allows setting
|
||||
## custom FLAGS to work at build-time.
|
||||
|
||||
deps: mk_obj_dir |
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS) |
||||
@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS) |
||||
|
||||
obj/%.o: %.cpp |
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $< |
||||
|
||||
# '-' is 'ignore if missing' on first run
|
||||
-include $(DEPS) |
||||
|
||||
DAEMON_OBJS += $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC)) |
||||
$(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT) |
||||
$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS) |
||||
|
||||
$(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC)) |
||||
ifneq ($(USE_STATIC),yes) |
||||
$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^ |
||||
endif |
||||
|
||||
$(SHLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC)) |
||||
$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^ |
||||
|
||||
$(ARLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC)) |
||||
ar -r $@ $^ |
||||
|
||||
$(ARLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC)) |
||||
ar -r $@ $^ |
||||
|
||||
clean: |
||||
rm -rf obj |
||||
$(RM) $(I2PD) $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT) |
||||
|
||||
strip: $(I2PD) $(SHLIB_CLIENT) $(SHLIB) |
||||
strip $^ |
||||
|
||||
LATEST_TAG=$(shell git describe --tags --abbrev=0 master) |
||||
dist: |
||||
git archive --format=tar.gz -9 --worktree-attributes \
|
||||
--prefix=i2pd_$(LATEST_TAG)/ $(LATEST_TAG) -o i2pd_$(LATEST_TAG).tar.gz |
||||
|
||||
.PHONY: all |
||||
.PHONY: clean |
||||
.PHONY: deps |
||||
.PHONY: dist |
||||
.PHONY: api |
||||
.PHONY: api_client |
||||
.PHONY: mk_obj_dir |
||||
|
||||
@ -1,13 +1,38 @@
@@ -1,13 +1,38 @@
|
||||
CXX = g++ |
||||
WINDRES = windres |
||||
CXXFLAGS = -O2 -D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN |
||||
NEEDED_CXXFLAGS = -std=c++11 |
||||
BOOST_SUFFIX = -mt |
||||
INCFLAGS = -I/usr/include/ -I/usr/local/include/ |
||||
LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib -L/c/dev/openssl -L/c/dev/boost/lib |
||||
LDLIBS = -Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) -Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) -Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) -Wl,-Bstatic -lboost_regex$(BOOST_SUFFIX) -Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) -Wl,-Bstatic -lssl -Wl,-Bstatic -lcrypto -Wl,-Bstatic -lz -Wl,-Bstatic -lwsock32 -Wl,-Bstatic -lws2_32 -Wl,-Bstatic -lgdi32 -Wl,-Bstatic -liphlpapi -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -Wl,-Bstatic -lpthread |
||||
LDFLAGS = -mwindows -Wl,-rpath,/usr/local/lib \
|
||||
-L/usr/local/lib \
|
||||
-L/c/dev/openssl \
|
||||
-L/c/dev/boost/lib |
||||
LDLIBS = \
|
||||
-Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \
|
||||
-Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \
|
||||
-Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \
|
||||
-Wl,-Bstatic -lboost_regex$(BOOST_SUFFIX) \
|
||||
-Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \
|
||||
-Wl,-Bstatic -lssl \
|
||||
-Wl,-Bstatic -lcrypto \
|
||||
-Wl,-Bstatic -lz \
|
||||
-Wl,-Bstatic -lwsock32 \
|
||||
-Wl,-Bstatic -lws2_32 \
|
||||
-Wl,-Bstatic -lgdi32 \
|
||||
-Wl,-Bstatic -liphlpapi \
|
||||
-static-libgcc -static-libstdc++ \
|
||||
-Wl,-Bstatic -lstdc++ \
|
||||
-Wl,-Bstatic -lpthread |
||||
DAEMON_RC += Win32/Resource.rc |
||||
DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC)) |
||||
|
||||
ifeq ($(USE_AESNI),1) |
||||
CPU_FLAGS = -maes -DAESNI |
||||
else |
||||
CPU_FLAGS = -msse |
||||
endif |
||||
|
||||
obj/%.o : %.rc |
||||
$(WINDRES) -i $< -o $@ |
||||
|
||||
|
||||
@ -0,0 +1,157 @@
@@ -0,0 +1,157 @@
|
||||
#include <string.h> |
||||
#include <windows.h> |
||||
#include <shellapi.h> |
||||
//#include "../Daemon.h"
|
||||
#include "resource.h" |
||||
#include "Win32App.h" |
||||
|
||||
#define ID_ABOUT 2000 |
||||
#define ID_EXIT 2001 |
||||
|
||||
#define ID_TRAY_ICON 2050 |
||||
#define WM_TRAYICON (WM_USER + 1) |
||||
|
||||
void ShowPopupMenu (HWND hWnd, POINT *curpos, int wDefaultItem) |
||||
{ |
||||
HMENU hPopup = CreatePopupMenu(); |
||||
InsertMenu (hPopup, 0, MF_BYPOSITION | MF_STRING, ID_ABOUT, "About..."); |
||||
InsertMenu (hPopup, 1, MF_BYPOSITION | MF_STRING, ID_EXIT , "Exit"); |
||||
SetMenuDefaultItem (hPopup, ID_ABOUT, FALSE); |
||||
SetFocus (hWnd); |
||||
SendMessage (hWnd, WM_INITMENUPOPUP, (WPARAM)hPopup, 0); |
||||
|
||||
POINT p; |
||||
if (!curpos) |
||||
{ |
||||
GetCursorPos (&p); |
||||
curpos = &p; |
||||
} |
||||
|
||||
WORD cmd = TrackPopupMenu (hPopup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_NONOTIFY, curpos->x, curpos->y, 0, hWnd, NULL); |
||||
SendMessage (hWnd, WM_COMMAND, cmd, 0); |
||||
|
||||
DestroyMenu(hPopup); |
||||
} |
||||
|
||||
void AddTrayIcon (HWND hWnd) |
||||
{ |
||||
NOTIFYICONDATA nid; |
||||
memset(&nid, 0, sizeof(nid)); |
||||
nid.cbSize = sizeof(nid); |
||||
nid.hWnd = hWnd; |
||||
nid.uID = ID_TRAY_ICON; |
||||
nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; |
||||
nid.uCallbackMessage = WM_TRAYICON; |
||||
nid.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE (IDI_ICON1)); |
||||
strcpy (nid.szTip, "i2pd"); |
||||
Shell_NotifyIcon(NIM_ADD, &nid ); |
||||
} |
||||
|
||||
void RemoveTrayIcon (HWND hWnd) |
||||
{ |
||||
NOTIFYICONDATA nid; |
||||
nid.hWnd = hWnd; |
||||
nid.uID = ID_TRAY_ICON; |
||||
Shell_NotifyIcon (NIM_DELETE, &nid); |
||||
} |
||||
|
||||
static LRESULT CALLBACK WndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) |
||||
{ |
||||
switch (uMsg) |
||||
{ |
||||
case WM_CREATE: |
||||
{ |
||||
AddTrayIcon (hWnd); |
||||
break; |
||||
} |
||||
case WM_CLOSE: |
||||
{ |
||||
RemoveTrayIcon (hWnd); |
||||
PostQuitMessage (0); |
||||
break; |
||||
} |
||||
case WM_COMMAND: |
||||
{ |
||||
switch (LOWORD(wParam)) |
||||
{ |
||||
case ID_ABOUT: |
||||
{ |
||||
MessageBox( hWnd, TEXT("i2pd"), TEXT("About"), MB_ICONINFORMATION | MB_OK ); |
||||
return 0; |
||||
} |
||||
case ID_EXIT: |
||||
{ |
||||
PostMessage (hWnd, WM_CLOSE, 0, 0); |
||||
return 0; |
||||
} |
||||
} |
||||
break; |
||||
} |
||||
case WM_TRAYICON: |
||||
{ |
||||
SetForegroundWindow (hWnd); |
||||
switch (lParam) |
||||
{ |
||||
case WM_RBUTTONUP: |
||||
{ |
||||
SetForegroundWindow (hWnd); |
||||
ShowPopupMenu(hWnd, NULL, -1); |
||||
PostMessage (hWnd, WM_APP + 1, 0, 0); |
||||
break; |
||||
} |
||||
} |
||||
break; |
||||
} |
||||
} |
||||
return DefWindowProc( hWnd, uMsg, wParam, lParam); |
||||
} |
||||
|
||||
int WINAPI WinMain (HINSTANCE hInst, HINSTANCE prev, LPSTR cmdline, int show) |
||||
{ |
||||
// check if tunning already
|
||||
if (FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd"))) |
||||
{ |
||||
MessageBox(NULL, TEXT("I2Pd is running already"), TEXT("Warning"), MB_OK); |
||||
return 0; |
||||
} |
||||
// register main window
|
||||
WNDCLASSEX wclx; |
||||
memset (&wclx, 0, sizeof(wclx)); |
||||
wclx.cbSize = sizeof(wclx); |
||||
wclx.style = 0; |
||||
wclx.lpfnWndProc = WndProc; |
||||
wclx.cbClsExtra = 0; |
||||
wclx.cbWndExtra = 0; |
||||
wclx.hInstance = hInst; |
||||
wclx.hIcon = LoadIcon (hInst, IDI_APPLICATION); |
||||
wclx.hIconSm = LoadIcon (hInst, IDI_APPLICATION); |
||||
wclx.hCursor = LoadCursor (NULL, IDC_ARROW); |
||||
wclx.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); |
||||
wclx.lpszMenuName = NULL; |
||||
wclx.lpszClassName = I2PD_WIN32_CLASSNAME; |
||||
RegisterClassEx (&wclx); |
||||
// create new window
|
||||
if (!CreateWindow(I2PD_WIN32_CLASSNAME, TEXT("i2pd"), WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 250, 150, NULL, NULL, hInst, NULL)) |
||||
{ |
||||
MessageBox(NULL, "Failed to create main window", TEXT("Warning!"), MB_ICONERROR | MB_OK | MB_TOPMOST); |
||||
return 1; |
||||
} |
||||
|
||||
/* // init
|
||||
char * argv[] = { (char *)"i2pd" }; |
||||
Daemon.init(sizeof (argv)/sizeof (argv[0]), argv); |
||||
// start
|
||||
Daemon.start ();*/ |
||||
// main loop
|
||||
MSG msg; |
||||
while (GetMessage (&msg, NULL, 0, 0 )) |
||||
{ |
||||
TranslateMessage (&msg); |
||||
DispatchMessage (&msg); |
||||
} |
||||
/* // atop
|
||||
Daemon.stop ();*/ |
||||
// terminate
|
||||
UnregisterClass (I2PD_WIN32_CLASSNAME, hInst); |
||||
return msg.wParam; |
||||
} |
||||
@ -0,0 +1,6 @@
@@ -0,0 +1,6 @@
|
||||
#ifndef WIN32APP_H__ |
||||
#define WIN32APP_H__ |
||||
|
||||
#define I2PD_WIN32_CLASSNAME "i2pd main window" |
||||
|
||||
#endif // WIN32APP_H__
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
Loading…
Reference in new issue