From 0393497516f4b6518c07bc5161021f4169dac675 Mon Sep 17 00:00:00 2001 From: Antoine Chavasse Date: Wed, 11 Jul 2007 03:50:07 +0200 Subject: [PATCH] Starting the editor. --- CMakeLists.txt | 1 + app/CMakeLists.txt | 11 ----------- editor/CMakeLists.txt | 23 +++++++++++++++++++++++ editor/main.cpp | 14 ++++++++++++++ 4 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 editor/CMakeLists.txt create mode 100644 editor/main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a30604..4e8a375 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,5 +36,6 @@ subdirs( sdl gameservices app + editor python ) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index f6944e2..f41572d 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,16 +1,5 @@ -#find_package( Qt4 REQUIRED ) - -#add_definitions( ${QT_DEFINITIONS} ) -#include_directories( ${QT_INCLUDES} ) -#link_directories( ${QT_LIBRARY_DIR} ) - include_directories( ${PROJECT_SOURCE_DIR}/gameservices ) -#include( UsePkgConfig ) -#pkgconfig( bullet BULLET_INCLUDE BULLET_LIBDIR BULLET_LINKFLAGS BULLET_CFLAGS ) -#include_directories( ${BULLET_INCLUDE} ${BULLET_INCLUDE}/bullet ) -#message( STATUS "Found bulet: ${BULLET_INCLUDE}" ) - add_executable( awfulapp main.cpp app.cpp diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt new file mode 100644 index 0000000..5fb7e59 --- /dev/null +++ b/editor/CMakeLists.txt @@ -0,0 +1,23 @@ +find_package( Qt4 REQUIRED ) + +# Sigh... Why do people define functions that returns things like "const char"? +# Now I have to disable a warning that pops all over the place in Qt headers. +add_definitions( ${QT_DEFINITIONS} -Wno-return-type ) +include_directories( ${QT_INCLUDES} ) +link_directories( ${QT_LIBRARY_DIR} ) + +include_directories( ${PROJECT_SOURCE_DIR}/gameservices ) +include_directories( ${PROJECT_SOURCE_DIR}/toolservices ) + +add_executable( aweditor + main.cpp +) + +target_link_libraries( aweditor + awgameservices + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} +) + +install( TARGETS aweditor DESTINATION bin ) diff --git a/editor/main.cpp b/editor/main.cpp new file mode 100644 index 0000000..321f097 --- /dev/null +++ b/editor/main.cpp @@ -0,0 +1,14 @@ + #include + #include + + int main(int argc, char *argv[]) + { + QApplication app(argc, argv); + + QPushButton hello("Hello world!"); + hello.resize(100, 30); + + hello.show(); + return app.exec(); + } + \ No newline at end of file -- 2.11.4.GIT