Skip to content

Commit

Permalink
Started Python port
Browse files Browse the repository at this point in the history
  • Loading branch information
wedesoft committed Jan 21, 2012
1 parent 8e2672f commit 631834a
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ battleship.tar.bz2
*.un~
*.swp
*.o
*.pyc
ui_*.rb
ui_*.py
ui_*.hh
qrc_*.rb
qrc_*.py
moc_*.cc
qrc_*.cc

17 changes: 15 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
SUFFIXES = .rb .ui .cc .hh
SUFFIXES = .rb .ui .cc .hh .py

CXXOPTS = -I/usr/include/qt4
LDADD = -lQtGui -lQtSvg -lQtCore

RUBY = ruby
RBUIC = rbuic4
RBRCC = rbrcc
PYTHON = python
PYUIC = pyuic4
PYRCC = pyrcc4
UIC = uic-qt4
MOC = moc-qt4
RCC = rcc
Expand All @@ -14,6 +17,7 @@ MKDIR = mkdir
CP = cp

RUBYUI = ui_gamewindow.rb qrc_battleship.rb
PYTHONUI = ui_gamewindow.py qrc_battleship.py
CCUI = ui_gamewindow.hh
OBJECTS = battleship.o gamewindow.o game.o boardview.o player.o
MOC_OBJECTS = moc_gamewindow.o moc_boardview.o
Expand All @@ -22,14 +26,15 @@ RCCOBJ = qrc_battleship.o
SOURCES = battleship.cc boardview.cc game.cc gamewindow.cc player.cc \
boardview.hh game.hh gamewindow.hh player.hh \
battleship.rb boardview.rb game.rb gamewindow.rb player.rb tc_battleship.rb \
battleship.py gamewindwo.py \
gamewindow.ui battleship.qrc \
battleship.svg carrier.svg destroyer.svg hit.svg miss.svg panel.svg patrol\ boat.svg \
submarine.svg \
Makefile Makefile.mingw Makefile.macos

default: all

all: cpp ruby
all: cpp python ruby

cpp: battleship

Expand All @@ -46,6 +51,8 @@ battleship: $(CCUI) $(OBJECTS) $(MOC_OBJECTS) $(RCCOBJ)

ruby: $(RUBYUI)

python: $(PYTHONUI)

test:
$(RUBY) tc_battleship.rb

Expand All @@ -65,6 +72,9 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
ui_%.rb: %.ui
$(RBUIC) $< > $@

ui_%.py: %.ui
$(PYUIC) $< > $@

ui_%.hh: %.ui
$(UIC) $< > $@

Expand All @@ -74,6 +84,9 @@ moc_%.cc: %.hh
qrc_%.rb: %.qrc
$(RBRCC) $< > $@

qrc_%.py: %.qrc
$(PYRCC) $< > $@

qrc_%.cc: %.qrc
$(RCC) $< > $@

Expand Down
9 changes: 9 additions & 0 deletions battleship.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/python
import sys
from PyQt4 import QtGui
from gamewindow import GameWindow
app = QtGui.QApplication(sys.argv)
w = GameWindow()
w.show()
sys.exit(app.exec_())

5 changes: 5 additions & 0 deletions gamewindow.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from PyQt4 import QtGui
class GameWindow(QtGui.QWidget):
def __init__(self):
super(GameWindow, self).__init__()

0 comments on commit 631834a

Please sign in to comment.