Commit d1f50484 authored by Mark Frohnmayer's avatar Mark Frohnmayer
Browse files

more tnl2_test updates -- ui components hooked up

parent 1da7598b

tnl2_test/Makefile

0 → 100644
+293 −0
Original line number Diff line number Diff line 
#############################################################################

# Makefile for building: tnl2_test.app/Contents/MacOS/tnl2_test

# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri Mar 5 15:55:23 2010

# Project:  tnl2_test.pro

# Template: app

# Command: /usr/bin/qmake -spec /usr/local/Qt4.6/mkspecs/macx-g++ -macx -o Makefile tnl2_test.pro

#############################################################################



####### Compiler, tools and options



CC            = gcc

CXX           = g++

DEFINES       = -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED

CFLAGS        = -pipe -g -gdwarf-2 -arch i386 -Wall -W $(DEFINES)

CXXFLAGS      = -pipe -g -gdwarf-2 -arch i386 -Wall -W $(DEFINES)

INCPATH       = -I/usr/local/Qt4.6/mkspecs/macx-g++ -I. -I/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/usr/include/QtCore -I/Library/Frameworks/QtGui.framework/Versions/4/Headers -I/usr/include/QtGui -I/Library/Frameworks/QtOpenGL.framework/Versions/4/Headers -I/usr/include/QtOpenGL -I/usr/include -I../tnl2 -I../../torque_sockets/platform_library -I../../torque_sockets/lib/libtomcrypt/src/headers -I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/System/Library/Frameworks/AGL.framework/Headers -I. -I. -F/Library/Frameworks

LINK          = g++

LFLAGS        = -headerpad_max_install_names -arch i386

LIBS          = $(SUBLIBS) -F/Library/Frameworks -L/Library/Frameworks -L../../torque_sockets/lib/libtomcrypt -ltomcrypt -framework QtOpenGL -framework QtGui -framework QtCore -framework OpenGL -framework AGL 

AR            = ar cq

RANLIB        = ranlib -s

QMAKE         = /usr/bin/qmake

TAR           = tar -cf

COMPRESS      = gzip -9f

COPY          = cp -f

SED           = sed

COPY_FILE     = cp -f

COPY_DIR      = cp -f -R

STRIP         = 

INSTALL_FILE  = $(COPY_FILE)

INSTALL_DIR   = $(COPY_DIR)

INSTALL_PROGRAM = $(COPY_FILE)

DEL_FILE      = rm -f

SYMLINK       = ln -f -s

DEL_DIR       = rmdir

MOVE          = mv -f

CHK_DIR_EXISTS= test -d

MKDIR         = mkdir -p

export MACOSX_DEPLOYMENT_TARGET = 10.4



####### Output directory



OBJECTS_DIR   = ./



####### Files



SOURCES       = main.cpp \

		mainwindow.cpp \

		tnl2_test_widget.cpp \

		test_game.cpp moc_mainwindow.cpp \

		moc_tnl2_test_widget.cpp

OBJECTS       = main.o \

		mainwindow.o \

		tnl2_test_widget.o \

		test_game.o \

		moc_mainwindow.o \

		moc_tnl2_test_widget.o

DIST          = /usr/local/Qt4.6/mkspecs/common/unix.conf \

		/usr/local/Qt4.6/mkspecs/common/mac.conf \

		/usr/local/Qt4.6/mkspecs/common/mac-g++.conf \

		/usr/local/Qt4.6/mkspecs/qconfig.pri \

		/usr/local/Qt4.6/mkspecs/features/qt_functions.prf \

		/usr/local/Qt4.6/mkspecs/features/qt_config.prf \

		/usr/local/Qt4.6/mkspecs/features/exclusive_builds.prf \

		/usr/local/Qt4.6/mkspecs/features/default_pre.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/default_pre.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/dwarf2.prf \

		/usr/local/Qt4.6/mkspecs/features/debug.prf \

		/usr/local/Qt4.6/mkspecs/features/default_post.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/default_post.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/x86.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/objective_c.prf \

		/usr/local/Qt4.6/mkspecs/features/warn_on.prf \

		/usr/local/Qt4.6/mkspecs/features/qt.prf \

		/usr/local/Qt4.6/mkspecs/features/unix/opengl.prf \

		/usr/local/Qt4.6/mkspecs/features/unix/thread.prf \

		/usr/local/Qt4.6/mkspecs/features/moc.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/rez.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/sdk.prf \

		/usr/local/Qt4.6/mkspecs/features/resources.prf \

		/usr/local/Qt4.6/mkspecs/features/uic.prf \

		/usr/local/Qt4.6/mkspecs/features/yacc.prf \

		/usr/local/Qt4.6/mkspecs/features/lex.prf \

		/usr/local/Qt4.6/mkspecs/features/include_source_dir.prf \

		tnl2_test.pro

QMAKE_TARGET  = tnl2_test

DESTDIR       = 

TARGET        = tnl2_test.app/Contents/MacOS/tnl2_test



####### Custom Compiler Variables

QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS = -pipe \

		-g \

		-gdwarf-2 \

		-arch \

		i386 \

		-Wall \

		-W





first: all

####### Implicit rules



.SUFFIXES: .o .c .cpp .cc .cxx .C



.cpp.o:

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"



.cc.o:

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"



.cxx.o:

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"



.C.o:

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"



.c.o:

	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"



####### Build rules



all: Makefile tnl2_test.app/Contents/PkgInfo tnl2_test.app/Contents/Resources/empty.lproj tnl2_test.app/Contents/Info.plist $(TARGET)



$(TARGET): ui_mainwindow.h $(OBJECTS)  

	@$(CHK_DIR_EXISTS) tnl2_test.app/Contents/MacOS/ || $(MKDIR) tnl2_test.app/Contents/MacOS/ 

	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)



Makefile: tnl2_test.pro  /usr/local/Qt4.6/mkspecs/macx-g++/qmake.conf /usr/local/Qt4.6/mkspecs/common/unix.conf \

		/usr/local/Qt4.6/mkspecs/common/mac.conf \

		/usr/local/Qt4.6/mkspecs/common/mac-g++.conf \

		/usr/local/Qt4.6/mkspecs/qconfig.pri \

		/usr/local/Qt4.6/mkspecs/features/qt_functions.prf \

		/usr/local/Qt4.6/mkspecs/features/qt_config.prf \

		/usr/local/Qt4.6/mkspecs/features/exclusive_builds.prf \

		/usr/local/Qt4.6/mkspecs/features/default_pre.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/default_pre.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/dwarf2.prf \

		/usr/local/Qt4.6/mkspecs/features/debug.prf \

		/usr/local/Qt4.6/mkspecs/features/default_post.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/default_post.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/x86.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/objective_c.prf \

		/usr/local/Qt4.6/mkspecs/features/warn_on.prf \

		/usr/local/Qt4.6/mkspecs/features/qt.prf \

		/usr/local/Qt4.6/mkspecs/features/unix/opengl.prf \

		/usr/local/Qt4.6/mkspecs/features/unix/thread.prf \

		/usr/local/Qt4.6/mkspecs/features/moc.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/rez.prf \

		/usr/local/Qt4.6/mkspecs/features/mac/sdk.prf \

		/usr/local/Qt4.6/mkspecs/features/resources.prf \

		/usr/local/Qt4.6/mkspecs/features/uic.prf \

		/usr/local/Qt4.6/mkspecs/features/yacc.prf \

		/usr/local/Qt4.6/mkspecs/features/lex.prf \

		/usr/local/Qt4.6/mkspecs/features/include_source_dir.prf \

		/Library/Frameworks/QtOpenGL.framework/QtOpenGL.prl \

		/Library/Frameworks/QtGui.framework/QtGui.prl \

		/Library/Frameworks/QtCore.framework/QtCore.prl

	$(QMAKE) -spec /usr/local/Qt4.6/mkspecs/macx-g++ -macx -o Makefile tnl2_test.pro

/usr/local/Qt4.6/mkspecs/common/unix.conf:

/usr/local/Qt4.6/mkspecs/common/mac.conf:

/usr/local/Qt4.6/mkspecs/common/mac-g++.conf:

/usr/local/Qt4.6/mkspecs/qconfig.pri:

/usr/local/Qt4.6/mkspecs/features/qt_functions.prf:

/usr/local/Qt4.6/mkspecs/features/qt_config.prf:

/usr/local/Qt4.6/mkspecs/features/exclusive_builds.prf:

/usr/local/Qt4.6/mkspecs/features/default_pre.prf:

/usr/local/Qt4.6/mkspecs/features/mac/default_pre.prf:

/usr/local/Qt4.6/mkspecs/features/mac/dwarf2.prf:

/usr/local/Qt4.6/mkspecs/features/debug.prf:

/usr/local/Qt4.6/mkspecs/features/default_post.prf:

/usr/local/Qt4.6/mkspecs/features/mac/default_post.prf:

/usr/local/Qt4.6/mkspecs/features/mac/x86.prf:

/usr/local/Qt4.6/mkspecs/features/mac/objective_c.prf:

/usr/local/Qt4.6/mkspecs/features/warn_on.prf:

/usr/local/Qt4.6/mkspecs/features/qt.prf:

/usr/local/Qt4.6/mkspecs/features/unix/opengl.prf:

/usr/local/Qt4.6/mkspecs/features/unix/thread.prf:

/usr/local/Qt4.6/mkspecs/features/moc.prf:

/usr/local/Qt4.6/mkspecs/features/mac/rez.prf:

/usr/local/Qt4.6/mkspecs/features/mac/sdk.prf:

/usr/local/Qt4.6/mkspecs/features/resources.prf:

/usr/local/Qt4.6/mkspecs/features/uic.prf:

/usr/local/Qt4.6/mkspecs/features/yacc.prf:

/usr/local/Qt4.6/mkspecs/features/lex.prf:

/usr/local/Qt4.6/mkspecs/features/include_source_dir.prf:

/Library/Frameworks/QtOpenGL.framework/QtOpenGL.prl:

/Library/Frameworks/QtGui.framework/QtGui.prl:

/Library/Frameworks/QtCore.framework/QtCore.prl:

qmake:  FORCE

	@$(QMAKE) -spec /usr/local/Qt4.6/mkspecs/macx-g++ -macx -o Makefile tnl2_test.pro



tnl2_test.app/Contents/PkgInfo: 

	@$(CHK_DIR_EXISTS) tnl2_test.app/Contents || $(MKDIR) tnl2_test.app/Contents 

	@$(DEL_FILE) tnl2_test.app/Contents/PkgInfo

	@echo "APPL????" >tnl2_test.app/Contents/PkgInfo

tnl2_test.app/Contents/Resources/empty.lproj: 

	@$(CHK_DIR_EXISTS) tnl2_test.app/Contents/Resources || $(MKDIR) tnl2_test.app/Contents/Resources 

	@touch tnl2_test.app/Contents/Resources/empty.lproj

	

tnl2_test.app/Contents/Info.plist: 

	@$(CHK_DIR_EXISTS) tnl2_test.app/Contents || $(MKDIR) tnl2_test.app/Contents 

	@$(DEL_FILE) tnl2_test.app/Contents/Info.plist

	@sed -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,tnl2_test,g" -e "s,@TYPEINFO@,????,g" /usr/local/Qt4.6/mkspecs/macx-g++/Info.plist.app >tnl2_test.app/Contents/Info.plist

dist: 

	@$(CHK_DIR_EXISTS) .tmp/tnl2_test1.0.0 || $(MKDIR) .tmp/tnl2_test1.0.0 

	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents mainwindow.h tnl2_test_widget.h test_player.h test_net_interface.h test_game.h test_connection.h test_building.h .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp tnl2_test_widget.cpp test_game.cpp .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents mainwindow.ui .tmp/tnl2_test1.0.0/ && (cd `dirname .tmp/tnl2_test1.0.0` && $(TAR) tnl2_test1.0.0.tar tnl2_test1.0.0 && $(COMPRESS) tnl2_test1.0.0.tar) && $(MOVE) `dirname .tmp/tnl2_test1.0.0`/tnl2_test1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tnl2_test1.0.0





clean:compiler_clean 

	-$(DEL_FILE) $(OBJECTS)

	-$(DEL_FILE) *~ core *.core





####### Sub-libraries



distclean: clean

	-$(DEL_FILE) -r tnl2_test.app

	-$(DEL_FILE) Makefile





mocclean: compiler_moc_header_clean compiler_moc_source_clean



mocables: compiler_moc_header_make_all compiler_moc_source_make_all



compiler_objective_c_make_all:

compiler_objective_c_clean:

compiler_moc_header_make_all: moc_mainwindow.cpp moc_tnl2_test_widget.cpp

compiler_moc_header_clean:

	-$(DEL_FILE) moc_mainwindow.cpp moc_tnl2_test_widget.cpp

moc_mainwindow.cpp: mainwindow.h

	/Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ mainwindow.h -o moc_mainwindow.cpp



moc_tnl2_test_widget.cpp: tnl2_test_widget.h

	/Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ tnl2_test_widget.h -o moc_tnl2_test_widget.cpp



compiler_rcc_make_all:

compiler_rcc_clean:

compiler_image_collection_make_all: qmake_image_collection.cpp

compiler_image_collection_clean:

	-$(DEL_FILE) qmake_image_collection.cpp

compiler_moc_source_make_all:

compiler_moc_source_clean:

compiler_rez_source_make_all:

compiler_rez_source_clean:

compiler_uic_make_all: ui_mainwindow.h

compiler_uic_clean:

	-$(DEL_FILE) ui_mainwindow.h

ui_mainwindow.h: mainwindow.ui \

		tnl2_test_widget.h

	/Developer/Tools/Qt/uic mainwindow.ui -o ui_mainwindow.h



compiler_yacc_decl_make_all:

compiler_yacc_decl_clean:

compiler_yacc_impl_make_all:

compiler_yacc_impl_clean:

compiler_lex_make_all:

compiler_lex_clean:

compiler_clean: compiler_moc_header_clean compiler_uic_clean 



####### Compile



main.o: main.cpp mainwindow.h

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp



mainwindow.o: mainwindow.cpp mainwindow.h \

		ui_mainwindow.h \

		tnl2_test_widget.h

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp



tnl2_test_widget.o: tnl2_test_widget.cpp tnl2_test_widget.h

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o tnl2_test_widget.o tnl2_test_widget.cpp



test_game.o: test_game.cpp test_player.h \

		test_building.h \

		test_connection.h \

		test_game.h \

		test_net_interface.h

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o test_game.o test_game.cpp



moc_mainwindow.o: moc_mainwindow.cpp 

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp



moc_tnl2_test_widget.o: moc_tnl2_test_widget.cpp 

	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_tnl2_test_widget.o moc_tnl2_test_widget.cpp



####### Install



install:   FORCE



uninstall:   FORCE



FORCE:

tnl2_test/main.cpp

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#include <QtGui/QApplication>

#include "mainwindow.h"



int main(int argc, char *argv[])

{

    QApplication a(argc, argv);

    MainWindow w;

    w.show();

    return a.exec();

}

tnl2_test/mainwindow.cpp

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#include "mainwindow.h"

#include "ui_mainwindow.h"



MainWindow::MainWindow(QWidget *parent) :

    QMainWindow(parent),

    ui(new Ui::MainWindow)

{

    ui->setupUi(this);

}



MainWindow::~MainWindow()

{

    delete ui;

}



void MainWindow::changeEvent(QEvent *e)

{

    QMainWindow::changeEvent(e);

    switch (e->type()) {

    case QEvent::LanguageChange:

        ui->retranslateUi(this);

        break;

    default:

        break;

    }

}

tnl2_test/mainwindow.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#ifndef MAINWINDOW_H

#define MAINWINDOW_H



#include <QMainWindow>



namespace Ui {

    class MainWindow;

}



class MainWindow : public QMainWindow {

    Q_OBJECT

public:

    MainWindow(QWidget *parent = 0);

    ~MainWindow();



protected:

    void changeEvent(QEvent *e);



private:

    Ui::MainWindow *ui;

};



#endif // MAINWINDOW_H

tnl2_test/mainwindow.ui

0 → 100644
+90 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<ui version="4.0">

 <class>MainWindow</class>

 <widget class="QMainWindow" name="MainWindow">

  <property name="geometry">

   <rect>

    <x>0</x>

    <y>0</y>

    <width>299</width>

    <height>227</height>

   </rect>

  </property>

  <property name="windowTitle">

   <string>MainWindow</string>

  </property>

  <widget class="QWidget" name="centralWidget">

   <widget class="QPushButton" name="pushButton">

    <property name="geometry">

     <rect>

      <x>0</x>

      <y>0</y>

      <width>113</width>

      <height>32</height>

     </rect>

    </property>

    <property name="text">

     <string>Foo</string>

    </property>

   </widget>

   <widget class="tnl2_test_widget" name="view_widget" native="true">

    <property name="geometry">

     <rect>

      <x>10</x>

      <y>30</y>

      <width>281</width>

      <height>151</height>

     </rect>

    </property>

    <property name="sizePolicy">

     <sizepolicy hsizetype="Expanding" vsizetype="Expanding">

      <horstretch>0</horstretch>

      <verstretch>0</verstretch>

     </sizepolicy>

    </property>

   </widget>

  </widget>

  <widget class="QMenuBar" name="menuBar">

   <property name="geometry">

    <rect>

     <x>0</x>

     <y>0</y>

     <width>299</width>

     <height>22</height>

    </rect>

   </property>

   <widget class="QMenu" name="menuTnl2_example">

    <property name="title">

     <string>tnl2 example</string>

    </property>

    <addaction name="actionRock_it"/>

   </widget>

   <addaction name="menuTnl2_example"/>

  </widget>

  <widget class="QToolBar" name="mainToolBar">

   <attribute name="toolBarArea">

    <enum>TopToolBarArea</enum>

   </attribute>

   <attribute name="toolBarBreak">

    <bool>false</bool>

   </attribute>

  </widget>

  <widget class="QStatusBar" name="statusBar"/>

  <action name="actionRock_it">

   <property name="text">

    <string>Rock it</string>

   </property>

  </action>

 </widget>

 <layoutdefault spacing="6" margin="11"/>

 <customwidgets>

  <customwidget>

   <class>tnl2_test_widget</class>

   <extends>QWidget</extends>

   <header>tnl2_test_widget.h</header>

   <container>1</container>

  </customwidget>

 </customwidgets>

 <resources/>

 <connections/>

</ui>