diff --git a/Makefile b/Makefile index 4581022..1fec891 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ ipxconfig.exe: src/ipxconfig.cpp dpwsockx.dll: src/directplay.o src/log.o src/dpwsockx_stubs.o src/common.o $(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o dpwsockx.dll src/directplay.o src/log.o src/common.o src/dpwsockx_stubs.o src/dpwsockx.def -lwsock32 -ipxrouter.exe: src/router-exe.o src/router.o src/interface.o src/common.o src/log.o +ipxrouter.exe: src/router-exe.o src/router.o src/interface.o src/common.o src/log.o src/ipxrouter-rc.o $(CC) $(CFLAGS) -static-libgcc -mwindows -o ipxrouter.exe $^ -lws2_32 -liphlpapi src/ipxwrapper_stubs.s: src/ipxwrapper_stubs.txt @@ -79,6 +79,9 @@ src/mswsock_stubs.s: src/mswsock_stubs.txt src/dpwsockx_stubs.s: src/dpwsockx_stubs.txt perl mkstubs.pl src/dpwsockx_stubs.txt src/dpwsockx_stubs.s 3 +src/ipxrouter-rc.o: src/ipxrouter.rc + windres src/ipxrouter.rc -O coff -o src/ipxrouter-rc.o + %.dll: src/stubdll.o src/%_stubs.o src/log.o src/common.o src/%.def $(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o $@ $^ diff --git a/ipxrouter-16.png b/ipxrouter-16.png new file mode 100644 index 0000000..ce899a2 Binary files /dev/null and b/ipxrouter-16.png differ diff --git a/ipxrouter-32.png b/ipxrouter-32.png new file mode 100644 index 0000000..203d101 Binary files /dev/null and b/ipxrouter-32.png differ diff --git a/ipxrouter.ico b/ipxrouter.ico new file mode 100644 index 0000000..4f79fd2 Binary files /dev/null and b/ipxrouter.ico differ diff --git a/src/ipxrouter.rc b/src/ipxrouter.rc new file mode 100644 index 0000000..baa8f5f --- /dev/null +++ b/src/ipxrouter.rc @@ -0,0 +1 @@ +50 ICON "../ipxrouter.ico" diff --git a/src/router-exe.c b/src/router-exe.c index 897cada..019f697 100644 --- a/src/router-exe.c +++ b/src/router-exe.c @@ -25,8 +25,6 @@ struct reg_global global_conf; -static HMODULE netshell_dll = NULL; - #define APPWM_TRAY (WM_APP+1) #define MNU_EXIT 101 @@ -142,11 +140,7 @@ static void init_ui() { die("CreateWindow: ", w32_error(GetLastError())); } - if(!(netshell_dll = LoadLibrary("netshell.dll"))) { - die("Error loading netshell.dll: ", w32_error(GetLastError())); - } - - HICON icon = LoadIcon(netshell_dll, MAKEINTRESOURCE(162)); + HICON icon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(50), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); if(!icon) { die("Error loading icon: ", w32_error(GetLastError())); }