diff options
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/config.h | 76 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/makefile | 32 |
2 files changed, 0 insertions, 108 deletions
diff --git a/xorg-server/hw/xwin/xlaunch/config.h b/xorg-server/hw/xwin/xlaunch/config.h deleted file mode 100644 index e2774e894..000000000 --- a/xorg-server/hw/xwin/xlaunch/config.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2005 Alexander Gottwald - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name(s) of the above copyright - * holders shall not be used in advertising or otherwise to promote the sale, - * use or other dealings in this Software without prior written authorization. - * - * Authors: Alexander Gottwald, Colin Harrison - */ -#ifndef __CONFIG_H__ -#define __CONFIG_H__ -#define UNICODE -#define _UNICODE - -#define PROG_NUMBER 10 -#define HOST_NUMBER 10 -#define MAX_MESSAGE 256 -#define MAX_CAPTION 128 - -#include <windows.h> -#include <string> -#include <vector> -struct CConfig -{ - enum {MultiWindow, Fullscreen, Windowed, Nodecoration} window; - enum {NoClient, StartProgram, XDMCP} client; - enum {NoXClient, Local, PuTTY, OpenSSH} clientstart; - std::string display; - std::string protocol_path; - std::string program; - std::vector<std::string> progs; - bool compress; - bool local; - std::string protocol; - std::string host; - std::string user; - std::string password; - bool password_save; - bool password_start; - bool broadcast; - bool indirect; - std::string xdmcp_host; - std::vector<std::string> xhosts; - bool clipboard; - bool no_access_control; - std::string font_server; - std::string extra_params; - std::string extra_ssh; - CConfig() : window(MultiWindow), client(NoClient), clientstart(NoXClient), display(""), - protocol_path(""), program("xeyes"), progs(PROG_NUMBER), compress(false), host(""), user(""), - password(""), password_save(false), password_start(false), broadcast(false), - indirect(false), xdmcp_host(""), xhosts(HOST_NUMBER), clipboard(true), no_access_control(false), - font_server(), extra_params(), extra_ssh() {}; - void Load(const char * filename); - void Save(const char * filename); -}; - -#endif diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile deleted file mode 100644 index 63b37dd1b..000000000 --- a/xorg-server/hw/xwin/xlaunch/makefile +++ /dev/null @@ -1,32 +0,0 @@ -INCLUDELIBFILES = window\$(OBJDIR)\window.lib \
- $(MHMAKECONF)\libx11\src\$(OBJDIR)\libx11.lib \
- $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
- $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \
- $(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \
- $(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \
- $(MHMAKECONF)\libx11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \
- $(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \
- $(MHMAKECONF)\libx11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \
- $(MHMAKECONF)\libx11\src\xkb\$(OBJDIR)\libxkb.lib \
- $(MHMAKECONF)\libx11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \
- $(MHMAKECONF)\libx11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib
-
-CSRCS=config.cc main.cc
-
-WINAPP = xlaunch
-
-RESOURCES = resources.rc
-
-$(OBJDIR)\%.res : resources\%.rc
- $(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<
-
-LIBDIRS=$(dir $(INCLUDELIBFILES))
-
-load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
-
-ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib
-else
-LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib
-endif
-
|