Finish removing the Qt dependency.

This commit is contained in:
Ryan Prichard 2012-03-13 22:39:14 -07:00
parent 00eee82468
commit 119c5e0117
4 changed files with 19 additions and 37 deletions

View File

@ -21,7 +21,7 @@ Agent::Agent(LPCWSTR controlPipeName,
int initialCols,
int initialRows) :
m_terminal(NULL),
m_timer(NULL),
//m_timer(NULL),
m_childProcess(NULL),
m_childExitCode(-1),
m_syncCounter(0)

View File

@ -1,15 +1,11 @@
#ifndef AGENT_H
#define AGENT_H
#include <QObject>
#include <QPoint>
#include <windows.h>
#include "EventLoop.h"
class Win32Console;
class QLocalSocket;
class Terminal;
class QTimer;
class ReadBuffer;
class NamedPipe;
@ -29,7 +25,7 @@ private:
NamedPipe *makeSocket(LPCWSTR pipeName);
void resetConsoleTracking(bool sendClear = true);
private slots:
private:
void controlSocketReadyRead();
void handlePacket(ReadBuffer &packet);
int handleStartProcessPacket(ReadBuffer &packet);
@ -57,7 +53,6 @@ private:
NamedPipe *m_controlSocket;
NamedPipe *m_dataSocket;
Terminal *m_terminal;
QTimer *m_timer;
HANDLE m_childProcess;
int m_childExitCode;

View File

@ -1,14 +1,25 @@
include ../config.mk
include ../config-mingw.mk
include ../config-qt.mk
PROGRAM = pconsole-agent
HEADERS =
OBJECTS = EventLoop.o NamedPipe.o Agent.o Terminal.o Win32Console.o AgentDebugClient.o main.o
OBJECTS += $(patsubst %.h,moc_%.o,$(HEADERS))
CXXFLAGS += -I$(QT_INCLUDE)/QtNetwork -D_WIN32_WINNT=0x0501
LDFLAGS += -lQtNetwork4 -static-libgcc -static-libstdc++
OBJECTS = \
EventLoop.o \
NamedPipe.o \
Agent.o \
Terminal.o \
Win32Console.o \
AgentDebugClient.o \
main.o
CXXFLAGS += \
-DUNICODE \
-D_UNICODE \
-D_WIN32_WINNT=0x0501 \
-fno-exceptions \
-fno-rtti
LDFLAGS += -static-libgcc -static-libstdc++
all : $(PROGRAM)

View File

@ -1,24 +0,0 @@
ifndef QT_DIR
$(error The QT_DIR variable must be defined to the QtSDK mingw directory containing bin, include, and lib)
endif
QT_INCLUDE=${QT_DIR}/include
QT_LIB=${QT_DIR}/lib
MOC=${QT_DIR}/bin/moc
.PRECIOUS : moc_%.cc
moc_%.cc : %.h
@echo Making $@ from $<
@$(MOC) -o $@ $<
CXXFLAGS += \
-DUNICODE \
-D_UNICODE \
-I$(QT_INCLUDE) \
-I$(QT_INCLUDE)/Qt \
-I$(QT_INCLUDE)/QtCore
LDFLAGS += \
-municode \
-L$(QT_LIB) \
-lQtCore4