[Windstille-devel] rev 324 - trunk/src

[Ingo Ruhnke]

Author: grumbel
Date: 2004-05-15 01:36:23 +0200 (Sat, 15 May 2004)
New Revision: 324

Removed:
   trunk/src/editor.py
Modified:
   trunk/src/SConstruct
Log:


Modified: trunk/src/SConstruct
===================================================================
--- trunk/src/SConstruct        2004-05-14 23:22:42 UTC (rev 323)
+++ trunk/src/SConstruct        2004-05-14 23:36:23 UTC (rev 324)
@@ -1,12 +1,11 @@
 ## -*- mode: python -*-
 
 env = Environment(CXX = 'g++-3.3',
-                  CCFLAGS = '-g -O2 -Wall',
+                  CXXFLAGS = '-g -O2 -Wall',
                   SWIGFLAGS='-c++ -python',
                   SHLIBPREFIX='')
 
 Depends('flexlay_wrap.cxx', ['flexlay.i', 'clanlib.i'])
-
 env.Command('flexlay_wrap.cxx', 'flexlay.i', "swig -python -c++ $SOURCE")
 
 env.SharedLibrary(
@@ -64,59 +63,4 @@
           'clanGUIStyleSilver',
           'boost_python'])
 
-# env.SharedLibrary(
-#     target = 'flexlay',
-#     source = [
-#     'command_group.cxx',
-#     'editor.cxx',
-#     'scripting/editor.cxx',
-#     'editor_grid_layer.cxx',
-#     'editor_map.cxx',
-#     'editor_map_component.cxx',
-#     'editor_mapsize_layer.cxx',
-#     'editor_objmap.cxx',
-#     'editor_tilemap.cxx',
-#     'flexlay.cxx',
-#     'flexlay_python.cxx',
-#     'globals.cxx',
-#     'graphic_context_state.cxx',
-#     'gui_manager.cxx',
-#     'minimap.cxx',
-#     'object_add_command.cxx',
-#     'object_brush.cxx',
-#     'object_delete_command.cxx',
-#     'object_move_command.cxx',
-#     'object_selector.cxx',
-#     'object_transform_command.cxx',
-#     'objmap_object.cxx',
-#     'objmap_select_tool.cxx',
-#     'objmap_sprite_object.cxx',
-#     'paint_command.cxx',
-#     'popup_menu.cxx',
-#     'python_functor.cxx',
-#     'scripting/gui.cxx',
-#     'tile.cxx',
-#     'tile_brush.cxx',
-#     'tile_editor.cxx',
-#     'tile_selection.cxx',
-#     'tile_selector.cxx',
-#     'tilemap_paint_tool.cxx',
-#     'tilemap_select_tool.cxx',
-#     'tilemap_tool.cxx',
-#     'tileset.cxx',
-#     'tool_manager.cxx',
-#     'workspace.cxx',
-#     'zoom_tool.cxx'],
-#     CPPPATH=['/home/ingo/run/ClanLib-0.7-current//include/ClanLib-0.7/',
-#              '/usr/include/python2.2/',
-#              '..'],
-#     LIBPATH=['/home/ingo/run/ClanLib-0.7-current//lib/'],
-#     LIBS=['clanCore',
-#           'clanDisplay',
-#           'clanGL',
-#           'clanSignals',
-#           'clanGUI',
-#           'clanGUIStyleSilver',
-#           'boost_python'])
-
 # EOF #

Deleted: trunk/src/editor.py
===================================================================
--- trunk/src/editor.py 2004-05-14 23:22:42 UTC (rev 323)
+++ trunk/src/editor.py 2004-05-14 23:36:23 UTC (rev 324)
@@ -1,71 +0,0 @@
-##  $Id$
-## 
-##  Flexlay - A Generic 2D Game Editor
-##  Copyright (C) 2002 Ingo Ruhnke <address@hidden>
-##
-##  This program is free software; you can redistribute it and/or
-##  modify it under the terms of the GNU General Public License
-##  as published by the Free Software Foundation; either version 2
-##  of the License, or (at your option) any later version.
-##
-##  This program is distributed in the hope that it will be useful,
-##  but WITHOUT ANY WARRANTY; without even the implied warranty of
-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-##  GNU General Public License for more details.
-## 
-##  You should have received a copy of the GNU General Public License
-##  along with this program; if not, write to the Free Software
-##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-from flexlay import *
-
-flexlay_init()
-
-editor = Editor()
-gui = editor.get_gui()
-
-editor_map = EditorMapComponent(Rect(0, 0, 799, 599), gui.get_component())
-workspace  = Workspace(799, 599)
-editor_map.set_workspace(workspace)
-
-m = EditorMap("Foobar")
-workspace.set_map(m)
-tileset = Tileset(32)
-tilemap = TileMap(tileset, 100, 50)
-m.add(tilemap)
-tile = Tile("/home/ingo/cvs/supertux/supertux/data/images/tilesets/bonus1.png",
-            Color(255, 255, 255, 255),
-            Color(255,   0,   0, 128))
-tileset.add_tile(0, tile)
-tileset.add_tile(1, tile)
-tileset.add_tile(2, tile)
-
-tilemap_set_current(tilemap)
-tilemap_paint_tool_set_tilemap(tilemap)
-
-editor_set_brush_tile(1)
-
-def foo():
-    print "---My Callback---"
-    gui.quit()
-
-window = Window(Rect(50, 50, 350, 250), "My Window", gui.get_component())
-
-gui.push_component(window)
-button = Button(Rect(50, 50, 200, 75), "Quit", gui.get_component())
-connect(button.sig_clicked(), foo)
-gui.pop_component()
-
-button2 = Button(Rect(0, 0, 100, 25), "Quit", gui.get_component())
-connect(button2.sig_clicked(), foo)
-
-menu = Menu(gui.get_component());
-a = menu.add_item("File/Open...", "File/Open...")
-a = menu.add_item("File/Save...", "File/Save...")
-a = menu.add_item("File/Save As...", "File/Save As...")
-c = menu.foobar()
-gui.run()
-
-flexlay_deinit()
-
-# EOF #