[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src/Editor ImageListView.cpp ImageVie...
From: |
Matthias Braun |
Subject: |
[netPanzer-CVS] netpanzer/src/Editor ImageListView.cpp ImageVie... |
Date: |
Sat, 22 Nov 2003 11:00:41 -0500 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/11/22 11:00:38
Modified files:
src/Editor : ImageListView.cpp ImageViewer.cpp Jamfile
SDLView.cpp TemplateCreator.cpp
TemplateSelectWidget.cpp TileSet.cpp
TileSet.hpp TileSetEditor.cpp TileSetList.cpp
TileSetView.cpp TileTemplate.hpp main.cpp
Removed files:
src/Editor : Exception.cpp Exception.hpp FileSystem.cpp
FileSystem.hpp Log.cpp Log.hpp NoCopy.hpp
iXY.cpp iXY.hpp
Log message:
make teh editor use the new common libs
Patches:
Index: netpanzer/src/Editor/ImageListView.cpp
diff -u netpanzer/src/Editor/ImageListView.cpp:1.1
netpanzer/src/Editor/ImageListView.cpp:1.2
--- netpanzer/src/Editor/ImageListView.cpp:1.1 Sun Nov 16 17:40:59 2003
+++ netpanzer/src/Editor/ImageListView.cpp Sat Nov 22 11:00:38 2003
@@ -3,8 +3,8 @@
#include <iostream>
#include <SDL/SDL_image.h>
+#include "Util/Exception.hpp"
#include "ImageListView.hpp"
-#include "Exception.hpp"
class ImageLoaderThread : public wxThread
{
Index: netpanzer/src/Editor/ImageViewer.cpp
diff -u netpanzer/src/Editor/ImageViewer.cpp:1.1
netpanzer/src/Editor/ImageViewer.cpp:1.2
--- netpanzer/src/Editor/ImageViewer.cpp:1.1 Sun Nov 16 17:40:59 2003
+++ netpanzer/src/Editor/ImageViewer.cpp Sat Nov 22 11:00:38 2003
@@ -9,7 +9,7 @@
#include "ImageViewer.hpp"
#include "ImageListView.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
ImageViewer::ImageViewer(wxWindow* parent)
: wxSplitterWindow(parent), dirctrl(0)
Index: netpanzer/src/Editor/Jamfile
diff -u netpanzer/src/Editor/Jamfile:1.1 netpanzer/src/Editor/Jamfile:1.2
--- netpanzer/src/Editor/Jamfile:1.1 Sun Nov 16 17:40:59 2003
+++ netpanzer/src/Editor/Jamfile Sat Nov 22 11:00:38 2003
@@ -4,6 +4,7 @@
Application netpanzeredit : [ Wildcard *.cpp *.hpp ] ;
CFlags netpanzeredit : -DDATADIR=\\\"$(datadir)\\\" ;
+LinkWith netpanzeredit : netpanzertypes netpanzerutil ;
ExternalLibs netpanzeredit : WX SDL SDLIMAGE PHYSFS ;
Help netpanzeredit : "Build the netpanzer editor" ;
Index: netpanzer/src/Editor/SDLView.cpp
diff -u netpanzer/src/Editor/SDLView.cpp:1.3
netpanzer/src/Editor/SDLView.cpp:1.4
--- netpanzer/src/Editor/SDLView.cpp:1.3 Fri Nov 21 17:33:15 2003
+++ netpanzer/src/Editor/SDLView.cpp Sat Nov 22 11:00:38 2003
@@ -3,7 +3,7 @@
#include <iostream>
#include "SDLView.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
SDLView::SDLView(wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style,
Index: netpanzer/src/Editor/TemplateCreator.cpp
diff -u netpanzer/src/Editor/TemplateCreator.cpp:1.2
netpanzer/src/Editor/TemplateCreator.cpp:1.3
--- netpanzer/src/Editor/TemplateCreator.cpp:1.2 Wed Nov 19 12:25:07 2003
+++ netpanzer/src/Editor/TemplateCreator.cpp Sat Nov 22 11:00:38 2003
@@ -6,7 +6,7 @@
#include "TemplateCreator.hpp"
#include "TemplateSelectWidget.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
TemplateCreator::TemplateCreator(wxWindow* parent,
TileSet* newtileset, const std::string& filename)
Index: netpanzer/src/Editor/TemplateSelectWidget.cpp
diff -u netpanzer/src/Editor/TemplateSelectWidget.cpp:1.1
netpanzer/src/Editor/TemplateSelectWidget.cpp:1.2
--- netpanzer/src/Editor/TemplateSelectWidget.cpp:1.1 Sun Nov 16 17:40:59 2003
+++ netpanzer/src/Editor/TemplateSelectWidget.cpp Sat Nov 22 11:00:38 2003
@@ -4,7 +4,7 @@
#include <algorithm>
#include "TemplateSelectWidget.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "TileSet.hpp"
#define XSIZE 32
Index: netpanzer/src/Editor/TileSet.cpp
diff -u netpanzer/src/Editor/TileSet.cpp:1.4
netpanzer/src/Editor/TileSet.cpp:1.5
--- netpanzer/src/Editor/TileSet.cpp:1.4 Fri Nov 21 17:33:15 2003
+++ netpanzer/src/Editor/TileSet.cpp Sat Nov 22 11:00:38 2003
@@ -4,11 +4,11 @@
#include <stdint.h>
#include <memory>
-#include "NoCopy.hpp"
+#include "Util/NoCopy.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/Log.hpp"
#include "TileSet.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
-#include "Log.hpp"
static const char* MAGICSTRING="TLST";
static const uint32_t FILEFORMATVERSION=0001;
Index: netpanzer/src/Editor/TileSet.hpp
diff -u netpanzer/src/Editor/TileSet.hpp:1.1
netpanzer/src/Editor/TileSet.hpp:1.2
--- netpanzer/src/Editor/TileSet.hpp:1.1 Sun Nov 16 17:40:59 2003
+++ netpanzer/src/Editor/TileSet.hpp Sat Nov 22 11:00:38 2003
@@ -6,7 +6,7 @@
#include <vector>
#include <string>
-#include "iXY.hpp"
+#include "Types/iXY.hpp"
class TileSetHeader;
class ReadFile;
Index: netpanzer/src/Editor/TileSetEditor.cpp
diff -u netpanzer/src/Editor/TileSetEditor.cpp:1.2
netpanzer/src/Editor/TileSetEditor.cpp:1.3
--- netpanzer/src/Editor/TileSetEditor.cpp:1.2 Wed Nov 19 12:25:07 2003
+++ netpanzer/src/Editor/TileSetEditor.cpp Sat Nov 22 11:00:38 2003
@@ -10,8 +10,8 @@
#include "TileSetView.hpp"
#include "TileSetList.hpp"
#include "ImageViewer.hpp"
-#include "Exception.hpp"
-#include "FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/FileSystem.hpp"
TileSetEditor::TileSetEditor(wxWindow* parent)
: wxSplitterWindow(parent), currenttileset(0)
Index: netpanzer/src/Editor/TileSetList.cpp
diff -u netpanzer/src/Editor/TileSetList.cpp:1.1
netpanzer/src/Editor/TileSetList.cpp:1.2
--- netpanzer/src/Editor/TileSetList.cpp:1.1 Sun Nov 16 17:40:59 2003
+++ netpanzer/src/Editor/TileSetList.cpp Sat Nov 22 11:00:38 2003
@@ -4,9 +4,9 @@
#include <memory>
#include <string>
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "TileSet.hpp"
-#include "FileSystem.hpp"
+#include "Util/FileSystem.hpp"
#include "TileSetList.hpp"
TileSetList::TileSetList(wxWindow* parent)
Index: netpanzer/src/Editor/TileSetView.cpp
diff -u netpanzer/src/Editor/TileSetView.cpp:1.2
netpanzer/src/Editor/TileSetView.cpp:1.3
--- netpanzer/src/Editor/TileSetView.cpp:1.2 Thu Nov 20 19:19:23 2003
+++ netpanzer/src/Editor/TileSetView.cpp Sat Nov 22 11:00:38 2003
@@ -3,7 +3,7 @@
#include <iostream>
#include <stdio.h>
-#include "iXY.hpp"
+#include "Types/iXY.hpp"
#include "TemplateCreator.hpp"
#include "TileSetView.hpp"
#include "TileSet.hpp"
Index: netpanzer/src/Editor/TileTemplate.hpp
diff -u netpanzer/src/Editor/TileTemplate.hpp:1.1
netpanzer/src/Editor/TileTemplate.hpp:1.2
--- netpanzer/src/Editor/TileTemplate.hpp:1.1 Sun Nov 16 17:40:59 2003
+++ netpanzer/src/Editor/TileTemplate.hpp Sat Nov 22 11:00:38 2003
@@ -3,7 +3,8 @@
#include <stdio.h>
#include <assert.h>
-#include "NoCopy.hpp"
+
+#include "Util/NoCopy.hpp"
class ReadFile;
class TileSet;
Index: netpanzer/src/Editor/main.cpp
diff -u netpanzer/src/Editor/main.cpp:1.1 netpanzer/src/Editor/main.cpp:1.2
--- netpanzer/src/Editor/main.cpp:1.1 Sun Nov 16 17:40:59 2003
+++ netpanzer/src/Editor/main.cpp Sat Nov 22 11:00:38 2003
@@ -5,8 +5,8 @@
#include <SDL/SDL.h>
#include "Editor.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
class EditorApplication : public wxApp
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src/Editor ImageListView.cpp ImageVie...,
Matthias Braun <=