diff options
| -rw-r--r-- | xkbcomp/makefile | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winprefs.c | 2 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 4 | ||||
| -rw-r--r-- | xorg-server/makefile | 11 | ||||
| -rw-r--r-- | xorg-server/system.XWinrc | 5 |
5 files changed, 21 insertions, 5 deletions
diff --git a/xkbcomp/makefile b/xkbcomp/makefile index 89435e112..b7a64b0dd 100644 --- a/xkbcomp/makefile +++ b/xkbcomp/makefile @@ -15,7 +15,11 @@ LIBDIRS=$(dir $(INCLUDELIBFILES)) load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) +ifeq $(DEBUG),1 TTYAPP = xkbcomp +else +WINAPP = xkbcomp +endif DEFINES += DFLT_XKB_CONFIG_ROOT="\".\"" diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c index 1d94ec206..60c96aff7 100644 --- a/xorg-server/hw/xwin/winprefs.c +++ b/xorg-server/hw/xwin/winprefs.c @@ -399,7 +399,7 @@ HandleCustomWM_COMMAND (unsigned long hwndIn, CloseHandle (child.hProcess); } else - MessageBox(NULL, m->menuItem[j].param, "Mingrc Exec Command Error!", MB_OK | MB_ICONEXCLAMATION); + MessageBox(NULL, m->menuItem[j].param, "VcXsrv Exec Command Error!", MB_OK | MB_ICONEXCLAMATION); } return TRUE; #endif diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index eea137741..ef35e49f9 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -62,6 +62,10 @@ Section "VcXsrv (required)" File "..\protocol.txt"
File "..\system.XWinrc"
File "..\..\xkbcomp\obj\release\xkbcomp.exe"
+ File "..\..\apps\xcalc\obj\release\xcalc.exe"
+ File "..\xcalc"
+ File "..\xcalc-color"
+ File "..\..\apps\xclock\obj\release\xclock.exe"
File "..\XKeysymDB"
File "..\XErrorDB"
File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
diff --git a/xorg-server/makefile b/xorg-server/makefile index 896656c40..968c40915 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -104,6 +104,15 @@ load_makefile ..\xkbcomp\makefile MAKESERVER=0 DEBUG=0 xkbcomp.exe: ..\xkbcomp\obj\release\xkbcomp.exe copy $< $@ +%: ..\apps\xcalc\%.ad + copy $< $@ + +xcalc.exe: ..\apps\xcalc\obj\release\xcalc.exe XCalc XCalc-color + copy $< $@ + +xclock.exe: ..\apps\xclock\obj\release\xclock.exe + copy $< $@ + load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=0 plink.exe: ..\tools\plink\obj\release\plink.exe @@ -114,7 +123,7 @@ load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0 load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0 all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \ - ..\libX11\nls\all fonts.src\all xkbdata.src\all plink.exe \ + ..\libX11\nls\all fonts.src\all xkbdata.src\all plink.exe xclock.exe xcalc.exe \ opengl32.dll swrast_dri.dll swrast_dri.dll: ..\mesalib\lib\swrast_dri.dll diff --git a/xorg-server/system.XWinrc b/xorg-server/system.XWinrc index db1fd9100..94aabfd79 100644 --- a/xorg-server/system.XWinrc +++ b/xorg-server/system.XWinrc @@ -79,9 +79,8 @@ // Make some menus... menu apps { - xterm exec "xterm" - notepad exec notepad - xload exec "xload -display %display%" # Comment + xcalc exec "xcalc" + xclock exec "xclock" } menu root { |