1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00

flight/PiOS.win32: update Makefile.win32 with new UAVObjects, also change UAVObject headers to have a newline at the end.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1510 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
cwabbott 2010-09-02 23:55:24 +00:00 committed by cwabbott
parent f4464c01a7
commit d7a3ffb464
40 changed files with 477 additions and 484 deletions

View File

@ -13,6 +13,7 @@ endif
ifeq ($(UNAME), Darwin)
QT_SPEC=macx-g++
endif
QT_SPEC=win32-g++
# Set up misc host tools
RM=rm

View File

@ -149,13 +149,16 @@ SRC += $(OPUAVOBJ)/stabilizationsettings.c
SRC += $(OPUAVOBJ)/ahrsstatus.c
SRC += $(OPUAVOBJ)/baroaltitude.c
SRC += $(OPUAVOBJ)/attitudeactual.c
SRC += $(OPUAVOBJ)/attitudesettings.c
SRC += $(OPUAVOBJ)/flightsituationactual.c
SRC += $(OPUAVOBJ)/navigationsettings.c
SRC += $(OPUAVOBJ)/navigationdesired.c
SRC += $(OPUAVOBJ)/flightbatterystate.c
SRC += $(OPUAVOBJ)/attituderaw.c
SRC += $(OPUAVOBJ)/homelocation.c
SRC += $(OPUAVOBJ)/ahrscalibration.c
SRC += $(OPUAVOBJ)/ahrssettings.c
SRC += $(OPUAVOBJ)/gpstime.c
SRC += $(OPUAVOBJ)/gpssatellites.c
endif
## PIOS Hardware (win32)

View File

@ -108,7 +108,7 @@ typedef struct
#define portNO_CRITICAL_NESTING ( ( unsigned portLONG ) 0 )
//#define DEBUG_OUTPUT
#define DEBUG_OUTPUT
//#define ERROR_OUTPUT
#ifdef DEBUG_OUTPUT
@ -234,7 +234,11 @@ static DWORD WINAPI tick_generator(LPVOID lpParameter)
before = (float)clock()/CLOCKS_PER_SEC;
debug_printf("tick before, %f\n", before);
SetWaitableTimer(hTimer, &liDueTime, 0, NULL, NULL, FALSE);
WaitForMultipleObjects(2, hObjList, TRUE, INFINITE);
if(WaitForMultipleObjects(2, hObjList, TRUE, 1000) == WAIT_TIMEOUT)
{
printf("Tick generator: timed out at WaitForMultipleObjects\n");
return 0;
}
after = (float)clock()/CLOCKS_PER_SEC;
debug_printf("tick after, %f\n", after);
debug_printf("diff: %f\n", after - before);
@ -245,7 +249,11 @@ static DWORD WINAPI tick_generator(LPVOID lpParameter)
// wait till interrupt handler acknowledges the interrupt (avoids
// overruns).
SignalObjectAndWait(hIsrMutex, hTickAck, INFINITE, FALSE);
if(SignalObjectAndWait(hIsrMutex, hTickAck, 1000, FALSE) == WAIT_TIMEOUT)
{
printf("Tick generator: timed out at SignalObjectAndWait\n");
return 0;
}
}
}
@ -344,7 +352,11 @@ portBASE_TYPE xPortStartScheduler( void )
for(;;)
{
WaitForMultipleObjects(2, hObjList, TRUE, INFINITE);
if(WaitForMultipleObjects(2, hObjList, TRUE, 1000) == WAIT_TIMEOUT)
{
printf("vPortStartScheduler: timed out at WaitForMultipleObjects\n");
return 0;
}
psSim=(SSIM_T *)*pxCurrentTCB;
@ -385,7 +397,7 @@ portBASE_TYPE xPortStartScheduler( void )
SuspendThread(psSim->hThread);
vTaskIncrementTick();
debug_printf("Sending tick ack...\n");
//debug_printf("Sending tick ack...\n");
SetEvent(hTickAck);
break;

View File

@ -1578,6 +1578,7 @@ void vTaskSwitchContext( void )
/* Find the highest priority queue that contains ready tasks. */
while( listLIST_IS_EMPTY( &( pxReadyTasksLists[ uxTopReadyPriority ] ) ) )
{
printf("%i is empty\n", (int) uxTopReadyPriority);
--uxTopReadyPriority;
}

View File

@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: HITLNEWd
# Generated by qmake (2.01a) (Qt 4.6.2) on: ?? 28. ??? 19:28:31 2010
# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Sep 2 19:40:56 2010
# Project: hitlnew.pro
# Template: lib
#############################################################################
@ -12,23 +12,23 @@ CXX = g++
DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DGCS_LIBRARY_BASENAME=\"lib\" -DWITH_TESTS -DQT_NO_CAST_TO_ASCII -DQT_DLL -DQT_PLUGIN -DQT_TESTLIB_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT
CFLAGS = -g -Wall $(DEFINES)
CXXFLAGS = -g -frtti -fexceptions -mthreads -Wall $(DEFINES)
INCPATH = -I'd:/Qt/2010.02.1/qt/include/QtCore' -I'd:/Qt/2010.02.1/qt/include/QtNetwork' -I'd:/Qt/2010.02.1/qt/include/QtGui' -I'd:/Qt/2010.02.1/qt/include/QtTest' -I'd:/Qt/2010.02.1/qt/include' -I'../../libs' -I'../../plugins' -I'../../libs/libqxt/src/core' -I'../../libs/libqxt/src/core/logengines' -I'../../libs/libqxt/src/core' -I'../../libs/libqxt/src/core/logengines' -I'../../libs/libqxt/src/core' -I'../../libs/libqxt/src/core/logengines' -I'../../libs/libqxt/src/core' -I'../../libs/libqxt/src/core/logengines' -I'd:/Qt/2010.02.1/qt/include/ActiveQt' -I'debug' -I'.' -I'd:/Qt/2010.02.1/qt/mkspecs/win32-g++'
INCPATH = -I"c:\Qt\2010.02.1\qt\include\QtCore" -I"c:\Qt\2010.02.1\qt\include\QtNetwork" -I"c:\Qt\2010.02.1\qt\include\QtGui" -I"c:\Qt\2010.02.1\qt\include\QtTest" -I"c:\Qt\2010.02.1\qt\include" -I"..\..\libs" -I"..\..\plugins" -I"..\..\libs\libqxt\src\core" -I"..\..\libs\libqxt\src\core\logengines" -I"..\..\libs\libqxt\src\core" -I"..\..\libs\libqxt\src\core\logengines" -I"..\..\libs\libqxt\src\core" -I"..\..\libs\libqxt\src\core\logengines" -I"..\..\libs\libqxt\src\core" -I"..\..\libs\libqxt\src\core\logengines" -I"c:\Qt\2010.02.1\qt\include\ActiveQt" -I"debug" -I"." -I"c:\Qt\2010.02.1\qt\mkspecs\win32-g++"
LINK = g++
LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -mthreads -Wl -shared -Wl,--out-implib,d:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot/libHITLNEWd.a
LIBS = -L'd:/Qt/2010.02.1/qt/lib' -LD:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs -LD:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot -lAggregationd -lExtensionSystemd -lUtilsd -lQxtCored -lQExtSerialPortd -lCored -lUAVObjectsd -lQxtCored -lQExtSerialPortd -lQxtCored -lQExtSerialPortd -lUAVTalkd -lQxtCored -lQExtSerialPortd -lQtTestd4 -lQtGuid4 -lQtNetworkd4 -lQtCored4
QMAKE = d:/qt/2010.02.1/qt/bin/qmake.exe
IDC = d:/Qt/2010.02.1/qt/bin/idc.exe
LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -mthreads -Wl -shared -Wl,--out-implib,c:\Users\Connor\Documents\OpenPilot\trunk\ground\lib\openpilotgcs\plugins\OpenPilot\libHITLNEWd.a
LIBS = -L"c:\Qt\2010.02.1\qt\lib" -LC:/Users/Connor/Documents/OpenPilot/trunk/ground/lib/openpilotgcs -LC:/Users/Connor/Documents/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot -lAggregationd -lExtensionSystemd -lUtilsd -lQxtCored -lQExtSerialPortd -lCored -lUAVObjectsd -lQxtCored -lQExtSerialPortd -lQxtCored -lQExtSerialPortd -lUAVTalkd -lQxtCored -lQExtSerialPortd -lQtTestd4 -lQtGuid4 -lQtNetworkd4 -lQtCored4
QMAKE = c:\qt\2010.02.1\qt\bin\qmake.exe
IDC = c:\Qt\2010.02.1\qt\bin\idc.exe
IDL = midl
ZIP = zip -r -9
DEF_FILE =
RES_FILE =
COPY = cp
COPY = copy /y
COPY_FILE = $(COPY)
COPY_DIR = xcopy /s /q /y /i
DEL_FILE = rm
DEL_FILE = del
DEL_DIR = rmdir
MOVE = mv
CHK_DIR_EXISTS= test -d
MOVE = move
CHK_DIR_EXISTS= if not exist
MKDIR = mkdir
INSTALL_FILE = $(COPY_FILE)
INSTALL_PROGRAM = $(COPY_FILE)
@ -36,7 +36,7 @@ INSTALL_DIR = $(COPY_DIR)
####### Output directory
OBJECTS_DIR = debug/
OBJECTS_DIR = debug
####### Files
@ -48,15 +48,15 @@ SOURCES = hitlplugin.cpp \
hitlgadget.cpp \
simulator.cpp \
il2simulator.cpp \
fgsimulator.cpp debug/moc_hitlwidget.cpp \
debug/moc_hitloptionspage.cpp \
debug/moc_hitlfactory.cpp \
debug/moc_hitlconfiguration.cpp \
debug/moc_hitlgadget.cpp \
debug/moc_simulator.cpp \
debug/moc_fgsimulator.cpp \
debug/moc_il2simulator.cpp \
debug/qrc_hitlresources.cpp
fgsimulator.cpp debug\moc_hitlwidget.cpp \
debug\moc_hitloptionspage.cpp \
debug\moc_hitlfactory.cpp \
debug\moc_hitlconfiguration.cpp \
debug\moc_hitlgadget.cpp \
debug\moc_simulator.cpp \
debug\moc_fgsimulator.cpp \
debug\moc_il2simulator.cpp \
debug\qrc_hitlresources.cpp
OBJECTS = debug/hitlplugin.o \
debug/hitlwidget.o \
debug/hitloptionspage.o \
@ -77,9 +77,9 @@ OBJECTS = debug/hitlplugin.o \
debug/qrc_hitlresources.o
DIST =
QMAKE_TARGET = HITLNEWd
DESTDIR = ../../../lib/openpilotgcs/plugins/OpenPilot/ #avoid trailing-slash linebreak
DESTDIR = ..\..\..\lib\openpilotgcs\plugins\OpenPilot\ #avoid trailing-slash linebreak
TARGET = HITLNEWd.dll
DESTDIR_TARGET = ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEWd.dll
DESTDIR_TARGET = ..\..\..\lib\openpilotgcs\plugins\OpenPilot\HITLNEWd.dll
####### Implicit rules
@ -107,14 +107,14 @@ $(DESTDIR_TARGET): ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspe
qmake: FORCE
@$(QMAKE) -spec d:/Qt/2010.02.1/qt/mkspecs/win32-g++ -win32 -o Makefile.Debug hitlnew.pro
@$(QMAKE) -spec c:\Qt\2010.02.1\qt\mkspecs\win32-g++ -win32 -o Makefile.Debug hitlnew.pro
dist:
$(ZIP) HITLNEWd.zip $(SOURCES) $(DIST) hitlnew.pro d:/Qt/2010.02.1/qt/mkspecs/qconfig.pri d:/Qt/2010.02.1/qt/mkspecs/features/qt_functions.prf d:/Qt/2010.02.1/qt/mkspecs/features/qt_config.prf d:/Qt/2010.02.1/qt/mkspecs/features/exclusive_builds.prf d:/Qt/2010.02.1/qt/mkspecs/features/default_pre.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/default_pre.prf ../../../openpilotgcs.pri ../../openpilotgcsplugin.pri ../../libs/aggregation/aggregation.pri ../../libs/extensionsystem/extensionsystem_dependencies.pri ../../libs/extensionsystem/extensionsystem.pri ../../libs/utils/utils.pri ../../libs/libqxt/libqxt.pri ../../libs/qextserialport/qextserialport.pri ../coreplugin/coreplugin_dependencies.pri ../coreplugin/coreplugin.pri ../../libs/utils/utils.pri ../uavobjects/uavobjects_dependencies.pri ../uavobjects/uavobjects.pri ../uavobjects/uavobjects.pri ../coreplugin/coreplugin.pri ../../libs/utils/utils.pri ../uavtalk/uavtalk_dependencies.pri ../uavtalk/uavtalk.pri ../coreplugin/coreplugin.pri ../../libs/utils/utils.pri hitlnew_dependencies.pri d:/Qt/2010.02.1/qt/mkspecs/features/debug.prf d:/Qt/2010.02.1/qt/mkspecs/features/debug_and_release.prf d:/Qt/2010.02.1/qt/mkspecs/features/default_post.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/default_post.prf d:/Qt/2010.02.1/qt/mkspecs/features/build_pass.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/rtti.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/exceptions.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/stl.prf d:/Qt/2010.02.1/qt/mkspecs/features/shared.prf d:/Qt/2010.02.1/qt/mkspecs/features/dll.prf d:/Qt/2010.02.1/qt/mkspecs/features/warn_on.prf d:/Qt/2010.02.1/qt/mkspecs/features/qt.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/console.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/thread.prf d:/Qt/2010.02.1/qt/mkspecs/features/moc.prf d:/Qt/2010.02.1/qt/mkspecs/features/resources.prf d:/Qt/2010.02.1/qt/mkspecs/features/uic.prf d:/Qt/2010.02.1/qt/mkspecs/features/yacc.prf d:/Qt/2010.02.1/qt/mkspecs/features/lex.prf d:/Qt/2010.02.1/qt/mkspecs/features/include_source_dir.prf PLUGINSPECS HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES
$(ZIP) HITLNEWd.zip $(SOURCES) $(DIST) ..\..\..\openpilotgcs.pro c:\Qt\2010.02.1\qt\mkspecs\qconfig.pri c:\Qt\2010.02.1\qt\mkspecs\features\qt_functions.prf c:\Qt\2010.02.1\qt\mkspecs\features\qt_config.prf c:\Qt\2010.02.1\qt\mkspecs\features\exclusive_builds.prf c:\Qt\2010.02.1\qt\mkspecs\features\default_pre.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\default_pre.prf ..\..\..\openpilotgcs.pri ..\..\openpilotgcsplugin.pri ..\..\libs\aggregation\aggregation.pri ..\..\libs\extensionsystem\extensionsystem_dependencies.pri ..\..\libs\extensionsystem\extensionsystem.pri ..\..\libs\utils\utils.pri ..\..\libs\libqxt\libqxt.pri ..\..\libs\qextserialport\qextserialport.pri ..\coreplugin\coreplugin_dependencies.pri ..\coreplugin\coreplugin.pri ..\..\libs\utils\utils.pri ..\uavobjects\uavobjects_dependencies.pri ..\uavobjects\uavobjects.pri ..\uavobjects\uavobjects.pri ..\coreplugin\coreplugin.pri ..\..\libs\utils\utils.pri ..\uavtalk\uavtalk_dependencies.pri ..\uavtalk\uavtalk.pri ..\coreplugin\coreplugin.pri ..\..\libs\utils\utils.pri hitlnew_dependencies.pri c:\Qt\2010.02.1\qt\mkspecs\features\debug.prf c:\Qt\2010.02.1\qt\mkspecs\features\debug_and_release.prf c:\Qt\2010.02.1\qt\mkspecs\features\default_post.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\default_post.prf c:\Qt\2010.02.1\qt\mkspecs\features\build_pass.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\rtti.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\exceptions.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\stl.prf c:\Qt\2010.02.1\qt\mkspecs\features\shared.prf c:\Qt\2010.02.1\qt\mkspecs\features\dll.prf c:\Qt\2010.02.1\qt\mkspecs\features\warn_on.prf c:\Qt\2010.02.1\qt\mkspecs\features\qt.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\console.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\thread.prf c:\Qt\2010.02.1\qt\mkspecs\features\moc.prf c:\Qt\2010.02.1\qt\mkspecs\features\resources.prf c:\Qt\2010.02.1\qt\mkspecs\features\uic.prf c:\Qt\2010.02.1\qt\mkspecs\features\yacc.prf c:\Qt\2010.02.1\qt\mkspecs\features\lex.prf c:\Qt\2010.02.1\qt\mkspecs\features\include_source_dir.prf PLUGINSPECS HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES
clean: compiler_clean
-$(DEL_FILE) debug/hitlplugin.o debug/hitlwidget.o debug/hitloptionspage.o debug/hitlfactory.o debug/hitlconfiguration.o debug/hitlgadget.o debug/simulator.o debug/il2simulator.o debug/fgsimulator.o debug/moc_hitlwidget.o debug/moc_hitloptionspage.o debug/moc_hitlfactory.o debug/moc_hitlconfiguration.o debug/moc_hitlgadget.o debug/moc_simulator.o debug/moc_fgsimulator.o debug/moc_il2simulator.o debug/qrc_hitlresources.o
-$(DEL_FILE) d:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot/libHITLNEWd.a
-$(DEL_FILE) debug\hitlplugin.o debug\hitlwidget.o debug\hitloptionspage.o debug\hitlfactory.o debug\hitlconfiguration.o debug\hitlgadget.o debug\simulator.o debug\il2simulator.o debug\fgsimulator.o debug\moc_hitlwidget.o debug\moc_hitloptionspage.o debug\moc_hitlfactory.o debug\moc_hitlconfiguration.o debug\moc_hitlgadget.o debug\moc_simulator.o debug\moc_fgsimulator.o debug\moc_il2simulator.o debug\qrc_hitlresources.o
-$(DEL_FILE) c:\Users\Connor\Documents\OpenPilot\trunk\ground\lib\openpilotgcs\plugins\OpenPilot\libHITLNEWd.a
distclean: clean
-$(DEL_FILE) $(DESTDIR_TARGET)
@ -126,13 +126,13 @@ mocables: compiler_moc_header_make_all compiler_moc_source_make_all
compiler_copy2build_make_all: ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspec
compiler_copy2build_clean:
-$(DEL_FILE) ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspec
-$(DEL_FILE) ..\..\..\lib\openpilotgcs\plugins\OpenPilot\HITLNEW.pluginspec
../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspec: HITLNEW.pluginspec
cp HITLNEW.pluginspec ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspec
copy /y HITLNEW.pluginspec ..\..\..\lib\openpilotgcs\plugins\OpenPilot\HITLNEW.pluginspec
compiler_moc_header_make_all: debug/moc_hitlwidget.cpp debug/moc_hitloptionspage.cpp debug/moc_hitlfactory.cpp debug/moc_hitlconfiguration.cpp debug/moc_hitlgadget.cpp debug/moc_simulator.cpp debug/moc_fgsimulator.cpp debug/moc_il2simulator.cpp
compiler_moc_header_clean:
-$(DEL_FILE) debug/moc_hitlwidget.cpp debug/moc_hitloptionspage.cpp debug/moc_hitlfactory.cpp debug/moc_hitlconfiguration.cpp debug/moc_hitlgadget.cpp debug/moc_simulator.cpp debug/moc_fgsimulator.cpp debug/moc_il2simulator.cpp
-$(DEL_FILE) debug\moc_hitlwidget.cpp debug\moc_hitloptionspage.cpp debug\moc_hitlfactory.cpp debug\moc_hitlconfiguration.cpp debug\moc_hitlgadget.cpp debug\moc_simulator.cpp debug\moc_fgsimulator.cpp debug\moc_il2simulator.cpp
debug/moc_hitlwidget.cpp: simulator.h \
../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
@ -149,21 +149,21 @@ debug/moc_hitlwidget.cpp: simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlwidget.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlwidget.h -o debug/moc_hitlwidget.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlwidget.h -o debug\moc_hitlwidget.cpp
debug/moc_hitloptionspage.cpp: ../coreplugin/dialogs/ioptionspage.h \
../coreplugin/core_global.h \
hitloptionspage.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitloptionspage.h -o debug/moc_hitloptionspage.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitloptionspage.h -o debug\moc_hitloptionspage.cpp
debug/moc_hitlfactory.cpp: ../coreplugin/iuavgadgetfactory.h \
../coreplugin/core_global.h \
hitlfactory.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlfactory.h -o debug/moc_hitlfactory.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlfactory.h -o debug\moc_hitlfactory.cpp
debug/moc_hitlconfiguration.cpp: ../coreplugin/iuavgadgetconfiguration.h \
../coreplugin/core_global.h \
@ -183,11 +183,11 @@ debug/moc_hitlconfiguration.cpp: ../coreplugin/iuavgadgetconfiguration.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlconfiguration.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlconfiguration.h -o debug/moc_hitlconfiguration.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlconfiguration.h -o debug\moc_hitlconfiguration.cpp
debug/moc_hitlgadget.cpp: ../coreplugin/iuavgadget.h \
../coreplugin/icontext.h \
@ -209,11 +209,11 @@ debug/moc_hitlgadget.cpp: ../coreplugin/iuavgadget.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlgadget.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlgadget.h -o debug/moc_hitlgadget.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlgadget.h -o debug\moc_hitlgadget.cpp
debug/moc_simulator.cpp: ../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
@ -230,13 +230,13 @@ debug/moc_simulator.cpp: ../uavtalk/telemetrymanager.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
simulator.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 simulator.h -o debug/moc_simulator.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 simulator.h -o debug\moc_simulator.cpp
debug/moc_fgsimulator.cpp: Simulator.h \
debug/moc_fgsimulator.cpp: simulator.h \
../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
../uavtalk/telemetrymonitor.h \
@ -252,14 +252,11 @@ debug/moc_fgsimulator.cpp: Simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
ui_fgoptionspage.h \
../../libs/utils/pathchooser.h \
../../libs/utils/utils_global.h \
fgsimulator.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 fgsimulator.h -o debug/moc_fgsimulator.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 fgsimulator.h -o debug\moc_fgsimulator.cpp
debug/moc_il2simulator.cpp: simulator.h \
../uavtalk/telemetrymanager.h \
@ -277,15 +274,15 @@ debug/moc_il2simulator.cpp: simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
il2simulator.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 il2simulator.h -o debug/moc_il2simulator.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 il2simulator.h -o debug\moc_il2simulator.cpp
compiler_rcc_make_all: debug/qrc_hitlresources.cpp
compiler_rcc_clean:
-$(DEL_FILE) debug/qrc_hitlresources.cpp
-$(DEL_FILE) debug\qrc_hitlresources.cpp
debug/qrc_hitlresources.cpp: hitlresources.qrc \
opfgprotocol.xml \
images/arrow-down.png \
@ -294,7 +291,7 @@ debug/qrc_hitlresources.cpp: hitlresources.qrc \
images/scrollbarvertical_up_arrow.png \
images/arrow-up2.png \
images/arrow-down2.png
d:/Qt/2010.02.1/qt/bin/rcc.exe -name hitlresources hitlresources.qrc -o debug/qrc_hitlresources.cpp
c:\Qt\2010.02.1\qt\bin\rcc.exe -name hitlresources hitlresources.qrc -o debug\qrc_hitlresources.cpp
compiler_image_collection_make_all: qmake_image_collection.cpp
compiler_image_collection_clean:
@ -307,10 +304,10 @@ compiler_uic_clean:
ui_hitloptionspage.h: hitloptionspage.ui \
../../libs/utils/pathchooser.h \
../../libs/utils/utils_global.h
d:/Qt/2010.02.1/qt/bin/uic.exe hitloptionspage.ui -o ui_hitloptionspage.h
c:\Qt\2010.02.1\qt\bin\uic.exe hitloptionspage.ui -o ui_hitloptionspage.h
ui_hitlwidget.h: hitlwidget.ui
d:/Qt/2010.02.1/qt/bin/uic.exe hitlwidget.ui -o ui_hitlwidget.h
c:\Qt\2010.02.1\qt\bin\uic.exe hitlwidget.ui -o ui_hitlwidget.h
compiler_yacc_decl_make_all:
compiler_yacc_decl_clean:
@ -327,7 +324,7 @@ compiler_clean: compiler_copy2build_clean compiler_moc_header_clean compiler_rcc
debug/hitlplugin.o: hitlplugin.cpp hitlplugin.h \
../../libs/extensionsystem/iplugin.h \
../../libs/extensionsystem/extensionsystem_global.h \
Simulator.h \
simulator.h \
../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
../uavtalk/telemetrymonitor.h \
@ -343,7 +340,7 @@ debug/hitlplugin.o: hitlplugin.cpp hitlplugin.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlfactory.h \
@ -353,12 +350,8 @@ debug/hitlplugin.o: hitlplugin.cpp hitlplugin.h \
../../libs/aggregation/aggregate.h \
../../libs/aggregation/aggregation_global.h \
fgsimulator.h \
ui_fgoptionspage.h \
../../libs/utils/pathchooser.h \
../../libs/utils/utils_global.h \
il2simulator.h \
simulator.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/hitlplugin.o hitlplugin.cpp
il2simulator.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\hitlplugin.o hitlplugin.cpp
debug/hitlwidget.o: hitlwidget.cpp hitlwidget.h \
simulator.h \
@ -377,18 +370,17 @@ debug/hitlwidget.o: hitlwidget.cpp hitlwidget.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
ui_hitlwidget.h \
HITLPlugin.h \
hitlplugin.h \
../../libs/extensionsystem/iplugin.h \
../../libs/extensionsystem/extensionsystem_global.h \
Simulator.h \
../coreplugin/icore.h \
../coreplugin/core_global.h \
../coreplugin/threadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/hitlwidget.o hitlwidget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\hitlwidget.o hitlwidget.cpp
debug/hitloptionspage.o: hitloptionspage.cpp hitloptionspage.h \
../coreplugin/dialogs/ioptionspage.h \
@ -411,7 +403,7 @@ debug/hitloptionspage.o: hitloptionspage.cpp hitloptionspage.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
ui_hitloptionspage.h \
@ -419,9 +411,8 @@ debug/hitloptionspage.o: hitloptionspage.cpp hitloptionspage.h \
../../libs/utils/utils_global.h \
hitlplugin.h \
../../libs/extensionsystem/iplugin.h \
../../libs/extensionsystem/extensionsystem_global.h \
Simulator.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/hitloptionspage.o hitloptionspage.cpp
../../libs/extensionsystem/extensionsystem_global.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\hitloptionspage.o hitloptionspage.cpp
debug/hitlfactory.o: hitlfactory.cpp hitlfactory.h \
../coreplugin/iuavgadgetfactory.h \
@ -443,7 +434,7 @@ debug/hitlfactory.o: hitlfactory.cpp hitlfactory.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlgadget.h \
@ -453,7 +444,7 @@ debug/hitlfactory.o: hitlfactory.cpp hitlfactory.h \
../coreplugin/iuavgadgetconfiguration.h \
hitloptionspage.h \
../coreplugin/dialogs/ioptionspage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/hitlfactory.o hitlfactory.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\hitlfactory.o hitlfactory.cpp
debug/hitlconfiguration.o: hitlconfiguration.cpp hitlconfiguration.h \
../coreplugin/iuavgadgetconfiguration.h \
@ -474,10 +465,10 @@ debug/hitlconfiguration.o: hitlconfiguration.cpp hitlconfiguration.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/hitlconfiguration.o hitlconfiguration.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\hitlconfiguration.o hitlconfiguration.cpp
debug/hitlgadget.o: hitlgadget.cpp hitlgadget.h \
../coreplugin/iuavgadget.h \
@ -500,12 +491,12 @@ debug/hitlgadget.o: hitlgadget.cpp hitlgadget.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlconfiguration.h \
../coreplugin/iuavgadgetconfiguration.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/hitlgadget.o hitlgadget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\hitlgadget.o hitlgadget.cpp
debug/simulator.o: simulator.cpp simulator.h \
../uavtalk/telemetrymanager.h \
@ -523,7 +514,7 @@ debug/simulator.o: simulator.cpp simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
../../libs/extensionsystem/pluginmanager.h \
@ -533,7 +524,7 @@ debug/simulator.o: simulator.cpp simulator.h \
../coreplugin/icore.h \
../coreplugin/core_global.h \
../coreplugin/threadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/simulator.o simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\simulator.o simulator.cpp
debug/il2simulator.o: il2simulator.cpp il2simulator.h \
simulator.h \
@ -552,7 +543,7 @@ debug/il2simulator.o: il2simulator.cpp il2simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
../../libs/extensionsystem/pluginmanager.h \
@ -562,10 +553,10 @@ debug/il2simulator.o: il2simulator.cpp il2simulator.h \
../coreplugin/icore.h \
../coreplugin/core_global.h \
../coreplugin/threadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/il2simulator.o il2simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\il2simulator.o il2simulator.cpp
debug/fgsimulator.o: fgsimulator.cpp fgsimulator.h \
Simulator.h \
simulator.h \
../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
../uavtalk/telemetrymonitor.h \
@ -581,12 +572,9 @@ debug/fgsimulator.o: fgsimulator.cpp fgsimulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
ui_fgoptionspage.h \
../../libs/utils/pathchooser.h \
../../libs/utils/utils_global.h \
../../libs/extensionsystem/pluginmanager.h \
../../libs/extensionsystem/extensionsystem_global.h \
../../libs/aggregation/aggregate.h \
@ -594,44 +582,44 @@ debug/fgsimulator.o: fgsimulator.cpp fgsimulator.h \
../coreplugin/icore.h \
../coreplugin/core_global.h \
../coreplugin/threadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/fgsimulator.o fgsimulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\fgsimulator.o fgsimulator.cpp
debug/moc_hitlwidget.o: debug/moc_hitlwidget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_hitlwidget.o debug/moc_hitlwidget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_hitlwidget.o debug\moc_hitlwidget.cpp
debug/moc_hitloptionspage.o: debug/moc_hitloptionspage.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_hitloptionspage.o debug/moc_hitloptionspage.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_hitloptionspage.o debug\moc_hitloptionspage.cpp
debug/moc_hitlfactory.o: debug/moc_hitlfactory.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_hitlfactory.o debug/moc_hitlfactory.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_hitlfactory.o debug\moc_hitlfactory.cpp
debug/moc_hitlconfiguration.o: debug/moc_hitlconfiguration.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_hitlconfiguration.o debug/moc_hitlconfiguration.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_hitlconfiguration.o debug\moc_hitlconfiguration.cpp
debug/moc_hitlgadget.o: debug/moc_hitlgadget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_hitlgadget.o debug/moc_hitlgadget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_hitlgadget.o debug\moc_hitlgadget.cpp
debug/moc_simulator.o: debug/moc_simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_simulator.o debug/moc_simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_simulator.o debug\moc_simulator.cpp
debug/moc_fgsimulator.o: debug/moc_fgsimulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_fgsimulator.o debug/moc_fgsimulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_fgsimulator.o debug\moc_fgsimulator.cpp
debug/moc_il2simulator.o: debug/moc_il2simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_il2simulator.o debug/moc_il2simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_il2simulator.o debug\moc_il2simulator.cpp
debug/qrc_hitlresources.o: debug/qrc_hitlresources.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/qrc_hitlresources.o debug/qrc_hitlresources.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\qrc_hitlresources.o debug\qrc_hitlresources.cpp
####### Install
install_target: first FORCE
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/ || $(MKDIR) $(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/
-$(INSTALL_FILE) "$(DESTDIR_TARGET)" "$(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/$(TARGET)"
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot $(MKDIR) $(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot
-$(INSTALL_FILE) "$(DESTDIR_TARGET)" "$(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot\$(TARGET)"
uninstall_target: FORCE
-$(DEL_FILE) "$(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/$(TARGET)"
-$(DEL_DIR) $(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/
-$(DEL_FILE) "$(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot\$(TARGET)"
-$(DEL_DIR) $(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot
install: install_target FORCE

View File

@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: HITLNEW
# Generated by qmake (2.01a) (Qt 4.6.2) on: ?? 28. ??? 19:28:31 2010
# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Sep 2 19:40:56 2010
# Project: hitlnew.pro
# Template: lib
#############################################################################
@ -12,23 +12,23 @@ CXX = g++
DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DGCS_LIBRARY_BASENAME=\"lib\" -DQT_NO_CAST_TO_ASCII -DQT_DLL -DQT_NO_DEBUG -DQT_PLUGIN -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT
CFLAGS = -O2 -Wall $(DEFINES)
CXXFLAGS = -O2 -frtti -fexceptions -mthreads -Wall $(DEFINES)
INCPATH = -I'd:/Qt/2010.02.1/qt/include/QtCore' -I'd:/Qt/2010.02.1/qt/include/QtNetwork' -I'd:/Qt/2010.02.1/qt/include/QtGui' -I'd:/Qt/2010.02.1/qt/include' -I'../../libs' -I'../../plugins' -I'../../libs/libqxt/src/core' -I'../../libs/libqxt/src/core/logengines' -I'../../libs/libqxt/src/core' -I'../../libs/libqxt/src/core/logengines' -I'../../libs/libqxt/src/core' -I'../../libs/libqxt/src/core/logengines' -I'../../libs/libqxt/src/core' -I'../../libs/libqxt/src/core/logengines' -I'd:/Qt/2010.02.1/qt/include/ActiveQt' -I'release' -I'.' -I'd:/Qt/2010.02.1/qt/mkspecs/win32-g++'
INCPATH = -I"c:\Qt\2010.02.1\qt\include\QtCore" -I"c:\Qt\2010.02.1\qt\include\QtNetwork" -I"c:\Qt\2010.02.1\qt\include\QtGui" -I"c:\Qt\2010.02.1\qt\include" -I"..\..\libs" -I"..\..\plugins" -I"..\..\libs\libqxt\src\core" -I"..\..\libs\libqxt\src\core\logengines" -I"..\..\libs\libqxt\src\core" -I"..\..\libs\libqxt\src\core\logengines" -I"..\..\libs\libqxt\src\core" -I"..\..\libs\libqxt\src\core\logengines" -I"..\..\libs\libqxt\src\core" -I"..\..\libs\libqxt\src\core\logengines" -I"c:\Qt\2010.02.1\qt\include\ActiveQt" -I"release" -I"." -I"c:\Qt\2010.02.1\qt\mkspecs\win32-g++"
LINK = g++
LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -mthreads -Wl -shared -Wl,--out-implib,d:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot/libHITLNEW.a
LIBS = -L'd:/Qt/2010.02.1/qt/lib' -LD:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs -LD:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot -lAggregation -lExtensionSystem -lUtils -lQxtCore -lQExtSerialPort -lCore -lUAVObjects -lQxtCore -lQExtSerialPort -lQxtCore -lQExtSerialPort -lUAVTalk -lQxtCore -lQExtSerialPort -lQtGui4 -lQtNetwork4 -lQtCore4
QMAKE = d:/qt/2010.02.1/qt/bin/qmake.exe
IDC = d:/Qt/2010.02.1/qt/bin/idc.exe
LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -mthreads -Wl -shared -Wl,--out-implib,c:\Users\Connor\Documents\OpenPilot\trunk\ground\lib\openpilotgcs\plugins\OpenPilot\libHITLNEW.a
LIBS = -L"c:\Qt\2010.02.1\qt\lib" -LC:/Users/Connor/Documents/OpenPilot/trunk/ground/lib/openpilotgcs -LC:/Users/Connor/Documents/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot -lAggregation -lExtensionSystem -lUtils -lQxtCore -lQExtSerialPort -lCore -lUAVObjects -lQxtCore -lQExtSerialPort -lQxtCore -lQExtSerialPort -lUAVTalk -lQxtCore -lQExtSerialPort -lQtGui4 -lQtNetwork4 -lQtCore4
QMAKE = c:\qt\2010.02.1\qt\bin\qmake.exe
IDC = c:\Qt\2010.02.1\qt\bin\idc.exe
IDL = midl
ZIP = zip -r -9
DEF_FILE =
RES_FILE =
COPY = cp
COPY = copy /y
COPY_FILE = $(COPY)
COPY_DIR = xcopy /s /q /y /i
DEL_FILE = rm
DEL_FILE = del
DEL_DIR = rmdir
MOVE = mv
CHK_DIR_EXISTS= test -d
MOVE = move
CHK_DIR_EXISTS= if not exist
MKDIR = mkdir
INSTALL_FILE = $(COPY_FILE)
INSTALL_PROGRAM = $(COPY_FILE)
@ -36,7 +36,7 @@ INSTALL_DIR = $(COPY_DIR)
####### Output directory
OBJECTS_DIR = release/
OBJECTS_DIR = release
####### Files
@ -48,15 +48,15 @@ SOURCES = hitlplugin.cpp \
hitlgadget.cpp \
simulator.cpp \
il2simulator.cpp \
fgsimulator.cpp release/moc_hitlwidget.cpp \
release/moc_hitloptionspage.cpp \
release/moc_hitlfactory.cpp \
release/moc_hitlconfiguration.cpp \
release/moc_hitlgadget.cpp \
release/moc_simulator.cpp \
release/moc_fgsimulator.cpp \
release/moc_il2simulator.cpp \
release/qrc_hitlresources.cpp
fgsimulator.cpp release\moc_hitlwidget.cpp \
release\moc_hitloptionspage.cpp \
release\moc_hitlfactory.cpp \
release\moc_hitlconfiguration.cpp \
release\moc_hitlgadget.cpp \
release\moc_simulator.cpp \
release\moc_fgsimulator.cpp \
release\moc_il2simulator.cpp \
release\qrc_hitlresources.cpp
OBJECTS = release/hitlplugin.o \
release/hitlwidget.o \
release/hitloptionspage.o \
@ -77,9 +77,9 @@ OBJECTS = release/hitlplugin.o \
release/qrc_hitlresources.o
DIST =
QMAKE_TARGET = HITLNEW
DESTDIR = ../../../lib/openpilotgcs/plugins/OpenPilot/ #avoid trailing-slash linebreak
DESTDIR = ..\..\..\lib\openpilotgcs\plugins\OpenPilot\ #avoid trailing-slash linebreak
TARGET = HITLNEW.dll
DESTDIR_TARGET = ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.dll
DESTDIR_TARGET = ..\..\..\lib\openpilotgcs\plugins\OpenPilot\HITLNEW.dll
####### Implicit rules
@ -107,14 +107,14 @@ $(DESTDIR_TARGET): ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspe
qmake: FORCE
@$(QMAKE) -spec d:/Qt/2010.02.1/qt/mkspecs/win32-g++ -win32 -o Makefile.Release hitlnew.pro
@$(QMAKE) -spec c:\Qt\2010.02.1\qt\mkspecs\win32-g++ -win32 -o Makefile.Release hitlnew.pro
dist:
$(ZIP) HITLNEW.zip $(SOURCES) $(DIST) hitlnew.pro d:/Qt/2010.02.1/qt/mkspecs/qconfig.pri d:/Qt/2010.02.1/qt/mkspecs/features/qt_functions.prf d:/Qt/2010.02.1/qt/mkspecs/features/qt_config.prf d:/Qt/2010.02.1/qt/mkspecs/features/exclusive_builds.prf d:/Qt/2010.02.1/qt/mkspecs/features/default_pre.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/default_pre.prf ../../../openpilotgcs.pri ../../openpilotgcsplugin.pri ../../libs/aggregation/aggregation.pri ../../libs/extensionsystem/extensionsystem_dependencies.pri ../../libs/extensionsystem/extensionsystem.pri ../../libs/utils/utils.pri ../../libs/libqxt/libqxt.pri ../../libs/qextserialport/qextserialport.pri ../coreplugin/coreplugin_dependencies.pri ../coreplugin/coreplugin.pri ../../libs/utils/utils.pri ../uavobjects/uavobjects_dependencies.pri ../uavobjects/uavobjects.pri ../uavobjects/uavobjects.pri ../coreplugin/coreplugin.pri ../../libs/utils/utils.pri ../uavtalk/uavtalk_dependencies.pri ../uavtalk/uavtalk.pri ../coreplugin/coreplugin.pri ../../libs/utils/utils.pri hitlnew_dependencies.pri d:/Qt/2010.02.1/qt/mkspecs/features/release.prf d:/Qt/2010.02.1/qt/mkspecs/features/debug_and_release.prf d:/Qt/2010.02.1/qt/mkspecs/features/default_post.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/default_post.prf d:/Qt/2010.02.1/qt/mkspecs/features/build_pass.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/rtti.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/exceptions.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/stl.prf d:/Qt/2010.02.1/qt/mkspecs/features/shared.prf d:/Qt/2010.02.1/qt/mkspecs/features/dll.prf d:/Qt/2010.02.1/qt/mkspecs/features/warn_on.prf d:/Qt/2010.02.1/qt/mkspecs/features/qt.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/thread.prf d:/Qt/2010.02.1/qt/mkspecs/features/moc.prf d:/Qt/2010.02.1/qt/mkspecs/features/win32/windows.prf d:/Qt/2010.02.1/qt/mkspecs/features/resources.prf d:/Qt/2010.02.1/qt/mkspecs/features/uic.prf d:/Qt/2010.02.1/qt/mkspecs/features/yacc.prf d:/Qt/2010.02.1/qt/mkspecs/features/lex.prf d:/Qt/2010.02.1/qt/mkspecs/features/include_source_dir.prf PLUGINSPECS HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES
$(ZIP) HITLNEW.zip $(SOURCES) $(DIST) ..\..\..\openpilotgcs.pro c:\Qt\2010.02.1\qt\mkspecs\qconfig.pri c:\Qt\2010.02.1\qt\mkspecs\features\qt_functions.prf c:\Qt\2010.02.1\qt\mkspecs\features\qt_config.prf c:\Qt\2010.02.1\qt\mkspecs\features\exclusive_builds.prf c:\Qt\2010.02.1\qt\mkspecs\features\default_pre.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\default_pre.prf ..\..\..\openpilotgcs.pri ..\..\openpilotgcsplugin.pri ..\..\libs\aggregation\aggregation.pri ..\..\libs\extensionsystem\extensionsystem_dependencies.pri ..\..\libs\extensionsystem\extensionsystem.pri ..\..\libs\utils\utils.pri ..\..\libs\libqxt\libqxt.pri ..\..\libs\qextserialport\qextserialport.pri ..\coreplugin\coreplugin_dependencies.pri ..\coreplugin\coreplugin.pri ..\..\libs\utils\utils.pri ..\uavobjects\uavobjects_dependencies.pri ..\uavobjects\uavobjects.pri ..\uavobjects\uavobjects.pri ..\coreplugin\coreplugin.pri ..\..\libs\utils\utils.pri ..\uavtalk\uavtalk_dependencies.pri ..\uavtalk\uavtalk.pri ..\coreplugin\coreplugin.pri ..\..\libs\utils\utils.pri hitlnew_dependencies.pri c:\Qt\2010.02.1\qt\mkspecs\features\release.prf c:\Qt\2010.02.1\qt\mkspecs\features\debug_and_release.prf c:\Qt\2010.02.1\qt\mkspecs\features\default_post.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\default_post.prf c:\Qt\2010.02.1\qt\mkspecs\features\build_pass.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\rtti.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\exceptions.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\stl.prf c:\Qt\2010.02.1\qt\mkspecs\features\shared.prf c:\Qt\2010.02.1\qt\mkspecs\features\dll.prf c:\Qt\2010.02.1\qt\mkspecs\features\warn_on.prf c:\Qt\2010.02.1\qt\mkspecs\features\qt.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\thread.prf c:\Qt\2010.02.1\qt\mkspecs\features\moc.prf c:\Qt\2010.02.1\qt\mkspecs\features\win32\windows.prf c:\Qt\2010.02.1\qt\mkspecs\features\resources.prf c:\Qt\2010.02.1\qt\mkspecs\features\uic.prf c:\Qt\2010.02.1\qt\mkspecs\features\yacc.prf c:\Qt\2010.02.1\qt\mkspecs\features\lex.prf c:\Qt\2010.02.1\qt\mkspecs\features\include_source_dir.prf PLUGINSPECS HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES
clean: compiler_clean
-$(DEL_FILE) release/hitlplugin.o release/hitlwidget.o release/hitloptionspage.o release/hitlfactory.o release/hitlconfiguration.o release/hitlgadget.o release/simulator.o release/il2simulator.o release/fgsimulator.o release/moc_hitlwidget.o release/moc_hitloptionspage.o release/moc_hitlfactory.o release/moc_hitlconfiguration.o release/moc_hitlgadget.o release/moc_simulator.o release/moc_fgsimulator.o release/moc_il2simulator.o release/qrc_hitlresources.o
-$(DEL_FILE) d:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot/libHITLNEW.a
-$(DEL_FILE) release\hitlplugin.o release\hitlwidget.o release\hitloptionspage.o release\hitlfactory.o release\hitlconfiguration.o release\hitlgadget.o release\simulator.o release\il2simulator.o release\fgsimulator.o release\moc_hitlwidget.o release\moc_hitloptionspage.o release\moc_hitlfactory.o release\moc_hitlconfiguration.o release\moc_hitlgadget.o release\moc_simulator.o release\moc_fgsimulator.o release\moc_il2simulator.o release\qrc_hitlresources.o
-$(DEL_FILE) c:\Users\Connor\Documents\OpenPilot\trunk\ground\lib\openpilotgcs\plugins\OpenPilot\libHITLNEW.a
distclean: clean
-$(DEL_FILE) $(DESTDIR_TARGET)
@ -126,13 +126,13 @@ mocables: compiler_moc_header_make_all compiler_moc_source_make_all
compiler_copy2build_make_all: ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspec
compiler_copy2build_clean:
-$(DEL_FILE) ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspec
-$(DEL_FILE) ..\..\..\lib\openpilotgcs\plugins\OpenPilot\HITLNEW.pluginspec
../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspec: HITLNEW.pluginspec
cp HITLNEW.pluginspec ../../../lib/openpilotgcs/plugins/OpenPilot/HITLNEW.pluginspec
copy /y HITLNEW.pluginspec ..\..\..\lib\openpilotgcs\plugins\OpenPilot\HITLNEW.pluginspec
compiler_moc_header_make_all: release/moc_hitlwidget.cpp release/moc_hitloptionspage.cpp release/moc_hitlfactory.cpp release/moc_hitlconfiguration.cpp release/moc_hitlgadget.cpp release/moc_simulator.cpp release/moc_fgsimulator.cpp release/moc_il2simulator.cpp
compiler_moc_header_clean:
-$(DEL_FILE) release/moc_hitlwidget.cpp release/moc_hitloptionspage.cpp release/moc_hitlfactory.cpp release/moc_hitlconfiguration.cpp release/moc_hitlgadget.cpp release/moc_simulator.cpp release/moc_fgsimulator.cpp release/moc_il2simulator.cpp
-$(DEL_FILE) release\moc_hitlwidget.cpp release\moc_hitloptionspage.cpp release\moc_hitlfactory.cpp release\moc_hitlconfiguration.cpp release\moc_hitlgadget.cpp release\moc_simulator.cpp release\moc_fgsimulator.cpp release\moc_il2simulator.cpp
release/moc_hitlwidget.cpp: simulator.h \
../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
@ -149,21 +149,21 @@ release/moc_hitlwidget.cpp: simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlwidget.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlwidget.h -o release/moc_hitlwidget.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlwidget.h -o release\moc_hitlwidget.cpp
release/moc_hitloptionspage.cpp: ../coreplugin/dialogs/ioptionspage.h \
../coreplugin/core_global.h \
hitloptionspage.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitloptionspage.h -o release/moc_hitloptionspage.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitloptionspage.h -o release\moc_hitloptionspage.cpp
release/moc_hitlfactory.cpp: ../coreplugin/iuavgadgetfactory.h \
../coreplugin/core_global.h \
hitlfactory.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlfactory.h -o release/moc_hitlfactory.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlfactory.h -o release\moc_hitlfactory.cpp
release/moc_hitlconfiguration.cpp: ../coreplugin/iuavgadgetconfiguration.h \
../coreplugin/core_global.h \
@ -183,11 +183,11 @@ release/moc_hitlconfiguration.cpp: ../coreplugin/iuavgadgetconfiguration.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlconfiguration.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlconfiguration.h -o release/moc_hitlconfiguration.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlconfiguration.h -o release\moc_hitlconfiguration.cpp
release/moc_hitlgadget.cpp: ../coreplugin/iuavgadget.h \
../coreplugin/icontext.h \
@ -209,11 +209,11 @@ release/moc_hitlgadget.cpp: ../coreplugin/iuavgadget.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlgadget.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlgadget.h -o release/moc_hitlgadget.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 hitlgadget.h -o release\moc_hitlgadget.cpp
release/moc_simulator.cpp: ../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
@ -230,13 +230,13 @@ release/moc_simulator.cpp: ../uavtalk/telemetrymanager.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
simulator.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 simulator.h -o release/moc_simulator.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 simulator.h -o release\moc_simulator.cpp
release/moc_fgsimulator.cpp: Simulator.h \
release/moc_fgsimulator.cpp: simulator.h \
../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
../uavtalk/telemetrymonitor.h \
@ -252,14 +252,11 @@ release/moc_fgsimulator.cpp: Simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
ui_fgoptionspage.h \
../../libs/utils/pathchooser.h \
../../libs/utils/utils_global.h \
fgsimulator.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 fgsimulator.h -o release/moc_fgsimulator.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 fgsimulator.h -o release\moc_fgsimulator.cpp
release/moc_il2simulator.cpp: simulator.h \
../uavtalk/telemetrymanager.h \
@ -277,15 +274,15 @@ release/moc_il2simulator.cpp: simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
il2simulator.h
d:/Qt/2010.02.1/qt/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 il2simulator.h -o release/moc_il2simulator.cpp
C:/Qt/2010.02.1/qt/bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 il2simulator.h -o release\moc_il2simulator.cpp
compiler_rcc_make_all: release/qrc_hitlresources.cpp
compiler_rcc_clean:
-$(DEL_FILE) release/qrc_hitlresources.cpp
-$(DEL_FILE) release\qrc_hitlresources.cpp
release/qrc_hitlresources.cpp: hitlresources.qrc \
opfgprotocol.xml \
images/arrow-down.png \
@ -294,7 +291,7 @@ release/qrc_hitlresources.cpp: hitlresources.qrc \
images/scrollbarvertical_up_arrow.png \
images/arrow-up2.png \
images/arrow-down2.png
d:/Qt/2010.02.1/qt/bin/rcc.exe -name hitlresources hitlresources.qrc -o release/qrc_hitlresources.cpp
c:\Qt\2010.02.1\qt\bin\rcc.exe -name hitlresources hitlresources.qrc -o release\qrc_hitlresources.cpp
compiler_image_collection_make_all: qmake_image_collection.cpp
compiler_image_collection_clean:
@ -307,10 +304,10 @@ compiler_uic_clean:
ui_hitloptionspage.h: hitloptionspage.ui \
../../libs/utils/pathchooser.h \
../../libs/utils/utils_global.h
d:/Qt/2010.02.1/qt/bin/uic.exe hitloptionspage.ui -o ui_hitloptionspage.h
c:\Qt\2010.02.1\qt\bin\uic.exe hitloptionspage.ui -o ui_hitloptionspage.h
ui_hitlwidget.h: hitlwidget.ui
d:/Qt/2010.02.1/qt/bin/uic.exe hitlwidget.ui -o ui_hitlwidget.h
c:\Qt\2010.02.1\qt\bin\uic.exe hitlwidget.ui -o ui_hitlwidget.h
compiler_yacc_decl_make_all:
compiler_yacc_decl_clean:
@ -327,7 +324,7 @@ compiler_clean: compiler_copy2build_clean compiler_moc_header_clean compiler_rcc
release/hitlplugin.o: hitlplugin.cpp hitlplugin.h \
../../libs/extensionsystem/iplugin.h \
../../libs/extensionsystem/extensionsystem_global.h \
Simulator.h \
simulator.h \
../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
../uavtalk/telemetrymonitor.h \
@ -343,7 +340,7 @@ release/hitlplugin.o: hitlplugin.cpp hitlplugin.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlfactory.h \
@ -353,12 +350,8 @@ release/hitlplugin.o: hitlplugin.cpp hitlplugin.h \
../../libs/aggregation/aggregate.h \
../../libs/aggregation/aggregation_global.h \
fgsimulator.h \
ui_fgoptionspage.h \
../../libs/utils/pathchooser.h \
../../libs/utils/utils_global.h \
il2simulator.h \
simulator.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/hitlplugin.o hitlplugin.cpp
il2simulator.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\hitlplugin.o hitlplugin.cpp
release/hitlwidget.o: hitlwidget.cpp hitlwidget.h \
simulator.h \
@ -377,18 +370,17 @@ release/hitlwidget.o: hitlwidget.cpp hitlwidget.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
ui_hitlwidget.h \
HITLPlugin.h \
hitlplugin.h \
../../libs/extensionsystem/iplugin.h \
../../libs/extensionsystem/extensionsystem_global.h \
Simulator.h \
../coreplugin/icore.h \
../coreplugin/core_global.h \
../coreplugin/threadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/hitlwidget.o hitlwidget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\hitlwidget.o hitlwidget.cpp
release/hitloptionspage.o: hitloptionspage.cpp hitloptionspage.h \
../coreplugin/dialogs/ioptionspage.h \
@ -411,7 +403,7 @@ release/hitloptionspage.o: hitloptionspage.cpp hitloptionspage.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
ui_hitloptionspage.h \
@ -419,9 +411,8 @@ release/hitloptionspage.o: hitloptionspage.cpp hitloptionspage.h \
../../libs/utils/utils_global.h \
hitlplugin.h \
../../libs/extensionsystem/iplugin.h \
../../libs/extensionsystem/extensionsystem_global.h \
Simulator.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/hitloptionspage.o hitloptionspage.cpp
../../libs/extensionsystem/extensionsystem_global.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\hitloptionspage.o hitloptionspage.cpp
release/hitlfactory.o: hitlfactory.cpp hitlfactory.h \
../coreplugin/iuavgadgetfactory.h \
@ -443,7 +434,7 @@ release/hitlfactory.o: hitlfactory.cpp hitlfactory.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlgadget.h \
@ -453,7 +444,7 @@ release/hitlfactory.o: hitlfactory.cpp hitlfactory.h \
../coreplugin/iuavgadgetconfiguration.h \
hitloptionspage.h \
../coreplugin/dialogs/ioptionspage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/hitlfactory.o hitlfactory.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\hitlfactory.o hitlfactory.cpp
release/hitlconfiguration.o: hitlconfiguration.cpp hitlconfiguration.h \
../coreplugin/iuavgadgetconfiguration.h \
@ -474,10 +465,10 @@ release/hitlconfiguration.o: hitlconfiguration.cpp hitlconfiguration.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/hitlconfiguration.o hitlconfiguration.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\hitlconfiguration.o hitlconfiguration.cpp
release/hitlgadget.o: hitlgadget.cpp hitlgadget.h \
../coreplugin/iuavgadget.h \
@ -500,12 +491,12 @@ release/hitlgadget.o: hitlgadget.cpp hitlgadget.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
hitlconfiguration.h \
../coreplugin/iuavgadgetconfiguration.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/hitlgadget.o hitlgadget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\hitlgadget.o hitlgadget.cpp
release/simulator.o: simulator.cpp simulator.h \
../uavtalk/telemetrymanager.h \
@ -523,7 +514,7 @@ release/simulator.o: simulator.cpp simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
../../libs/extensionsystem/pluginmanager.h \
@ -533,7 +524,7 @@ release/simulator.o: simulator.cpp simulator.h \
../coreplugin/icore.h \
../coreplugin/core_global.h \
../coreplugin/threadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/simulator.o simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\simulator.o simulator.cpp
release/il2simulator.o: il2simulator.cpp il2simulator.h \
simulator.h \
@ -552,7 +543,7 @@ release/il2simulator.o: il2simulator.cpp il2simulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
../../libs/extensionsystem/pluginmanager.h \
@ -562,10 +553,10 @@ release/il2simulator.o: il2simulator.cpp il2simulator.h \
../coreplugin/icore.h \
../coreplugin/core_global.h \
../coreplugin/threadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/il2simulator.o il2simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\il2simulator.o il2simulator.cpp
release/fgsimulator.o: fgsimulator.cpp fgsimulator.h \
Simulator.h \
simulator.h \
../uavtalk/telemetrymanager.h \
../uavtalk/uavtalk_global.h \
../uavtalk/telemetrymonitor.h \
@ -581,12 +572,9 @@ release/fgsimulator.o: fgsimulator.cpp fgsimulator.h \
../uavtalk/telemetry.h \
../uavtalk/uavtalk.h \
../uavobjects/actuatordesired.h \
../uavobjects/altitudeactual.h \
../uavobjects/baroaltitude.h \
../uavobjects/attitudeactual.h \
../uavobjects/positionactual.h \
ui_fgoptionspage.h \
../../libs/utils/pathchooser.h \
../../libs/utils/utils_global.h \
../../libs/extensionsystem/pluginmanager.h \
../../libs/extensionsystem/extensionsystem_global.h \
../../libs/aggregation/aggregate.h \
@ -594,54 +582,54 @@ release/fgsimulator.o: fgsimulator.cpp fgsimulator.h \
../coreplugin/icore.h \
../coreplugin/core_global.h \
../coreplugin/threadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/fgsimulator.o fgsimulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\fgsimulator.o fgsimulator.cpp
release/moc_hitlwidget.o: release/moc_hitlwidget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_hitlwidget.o release/moc_hitlwidget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_hitlwidget.o release\moc_hitlwidget.cpp
release/moc_hitloptionspage.o: release/moc_hitloptionspage.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_hitloptionspage.o release/moc_hitloptionspage.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_hitloptionspage.o release\moc_hitloptionspage.cpp
release/moc_hitlfactory.o: release/moc_hitlfactory.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_hitlfactory.o release/moc_hitlfactory.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_hitlfactory.o release\moc_hitlfactory.cpp
release/moc_hitlconfiguration.o: release/moc_hitlconfiguration.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_hitlconfiguration.o release/moc_hitlconfiguration.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_hitlconfiguration.o release\moc_hitlconfiguration.cpp
release/moc_hitlgadget.o: release/moc_hitlgadget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_hitlgadget.o release/moc_hitlgadget.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_hitlgadget.o release\moc_hitlgadget.cpp
release/moc_simulator.o: release/moc_simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_simulator.o release/moc_simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_simulator.o release\moc_simulator.cpp
release/moc_fgsimulator.o: release/moc_fgsimulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_fgsimulator.o release/moc_fgsimulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_fgsimulator.o release\moc_fgsimulator.cpp
release/moc_il2simulator.o: release/moc_il2simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_il2simulator.o release/moc_il2simulator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_il2simulator.o release\moc_il2simulator.cpp
release/qrc_hitlresources.o: release/qrc_hitlresources.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/qrc_hitlresources.o release/qrc_hitlresources.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\qrc_hitlresources.o release\qrc_hitlresources.cpp
####### Install
install_target: first FORCE
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/ || $(MKDIR) $(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/
-$(INSTALL_FILE) "$(DESTDIR_TARGET)" "$(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/$(TARGET)"
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot $(MKDIR) $(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot
-$(INSTALL_FILE) "$(DESTDIR_TARGET)" "$(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot\$(TARGET)"
uninstall_target: FORCE
-$(DEL_FILE) "$(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/$(TARGET)"
-$(DEL_DIR) $(INSTALL_ROOT)/lib/opnepilotgcs/plugins/OpenPilot/
-$(DEL_FILE) "$(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot\$(TARGET)"
-$(DEL_DIR) $(INSTALL_ROOT)\lib\opnepilotgcs\plugins\OpenPilot
install_pluginspec: first FORCE
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/lib/openpilotgcs/plugins/OpenPilot/ || $(MKDIR) $(INSTALL_ROOT)/lib/openpilotgcs/plugins/OpenPilot/
-$(INSTALL_FILE) d:\Qt\QtProjects\OpenPilot\OpenPilot\trunk\ground\src\plugins\hitlnew\HITLNEW.pluginspec $(INSTALL_ROOT)/lib/openpilotgcs/plugins/OpenPilot/
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)\lib\openpilotgcs\plugins\OpenPilot $(MKDIR) $(INSTALL_ROOT)\lib\openpilotgcs\plugins\OpenPilot
-$(INSTALL_FILE) c:\Users\Connor\Documents\OpenPilot\trunk\ground\src\plugins\hitlnew\HITLNEW.pluginspec $(INSTALL_ROOT)\lib\openpilotgcs\plugins\OpenPilot
uninstall_pluginspec: FORCE
-$(DEL_FILE) -r $(INSTALL_ROOT)/lib/openpilotgcs/plugins/OpenPilot/d:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/src/plugins/hitlnew/HITLNEW.pluginspec
-$(DEL_DIR) $(INSTALL_ROOT)/lib/openpilotgcs/plugins/OpenPilot/
-$(DEL_FILE) $(INSTALL_ROOT)\lib\openpilotgcs\plugins\OpenPilot\HITLNEW.pluginspec
-$(DEL_DIR) $(INSTALL_ROOT)\lib\openpilotgcs\plugins\OpenPilot
install: install_target install_pluginspec FORCE

View File

@ -47,7 +47,7 @@ NavigationSettings::NavigationSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISS
fields.append( new UAVObjectField(QString("UpdatePeriod"), QString("ms"), UAVObjectField::UINT16, UpdatePeriodElemNames, QStringList()) );
QStringList AccelerationMaxElemNames;
AccelerationMaxElemNames.append("0");
fields.append( new UAVObjectField(QString("AccelerationMax"), QString("m/s"), UAVObjectField::FLOAT32, AccelerationMaxElemNames, QStringList()) );
fields.append( new UAVObjectField(QString("AccelerationMax"), QString("m/s²"), UAVObjectField::FLOAT32, AccelerationMaxElemNames, QStringList()) );
QStringList SpeedMaxElemNames;
SpeedMaxElemNames.append("0");
fields.append( new UAVObjectField(QString("SpeedMax"), QString("m/s"), UAVObjectField::FLOAT32, SpeedMaxElemNames, QStringList()) );