From 49ce932ecece43165acd75f7078c1f2eceb997ed Mon Sep 17 00:00:00 2001 From: kts Date: Tue, 21 Jan 2014 00:15:02 -0800 Subject: [PATCH] data.c/.h added to devcpp project. Tile editor runs fine on win32/64. --- devcpp/Makefile.win | 7 +++++-- devcpp/tile_editor.dev | 16 +++++++++++++--- devcpp/tile_editor.layout | 23 +++++++++++++++++++---- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/devcpp/Makefile.win b/devcpp/Makefile.win index 5065529..fda92f7 100644 --- a/devcpp/Makefile.win +++ b/devcpp/Makefile.win @@ -4,8 +4,8 @@ CPP = g++.exe CC = gcc.exe WINDRES = windres.exe -OBJ = ../tile_editor/elements.o ../tile_editor/font.o ../tile_editor/main.o ../tile_editor/sdl.o -LINKOBJ = ../tile_editor/elements.o ../tile_editor/font.o ../tile_editor/main.o ../tile_editor/sdl.o +OBJ = ../tile_editor/elements.o ../tile_editor/font.o ../tile_editor/main.o ../tile_editor/sdl.o ../data.o +LINKOBJ = ../tile_editor/elements.o ../tile_editor/font.o ../tile_editor/main.o ../tile_editor/sdl.o ../data.o LIBS = -L"C:/Program Files (x86)/Dev-Cpp/MinGW32/lib" -static-libstdc++ -static-libgcc -L"../../SDL-1.2.15/lib" -mwindows -lsdl -lSDL_image -lSDLmain -lws2_32 C:/Windows/System32/ws2_32.dll -g3 INCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include" -I"../../SDL-1.2.15/include" CXXINCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include" -I"../../SDL-1.2.15/include" @@ -36,3 +36,6 @@ $(BIN): $(OBJ) ../tile_editor/sdl.o: ../tile_editor/sdl.c $(CC) -c ../tile_editor/sdl.c -o ../tile_editor/sdl.o $(CFLAGS) + +../data.o: ../data.c + $(CC) -c ../data.c -o ../data.o $(CFLAGS) diff --git a/devcpp/tile_editor.dev b/devcpp/tile_editor.dev index 66a3cdc..83a56c5 100644 --- a/devcpp/tile_editor.dev +++ b/devcpp/tile_editor.dev @@ -29,7 +29,7 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 CompilerSettings=0000000000000000001000000 -UnitCount=9 +UnitCount=11 [VersionInfo] Major=1 @@ -51,9 +51,9 @@ AutoIncBuildNr=0 SyncProduct=1 [Unit11] -FileName=..\player.h +FileName=..\data.c CompileCpp=0 -Folder=timesynk-sdl +Folder=tile_editor Compile=1 Link=1 Priority=1000 @@ -350,3 +350,13 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= +[Unit10] +FileName=..\data.h +CompileCpp=0 +Folder=tile_editor +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + diff --git a/devcpp/tile_editor.layout b/devcpp/tile_editor.layout index 28cadd4..e587809 100644 --- a/devcpp/tile_editor.layout +++ b/devcpp/tile_editor.layout @@ -6,13 +6,22 @@ LeftChar=1 Open=0 Top=0 [Editors] -Order= +Order=-1 +Focused=-1 [Editor_1] -Open=0 -Top=0 +Open=1 +Top=1 +CursorCol=3 +CursorRow=354 +TopLine=324 +LeftChar=1 [Editor_2] -Open=0 +Open=1 Top=0 +CursorCol=1 +CursorRow=1 +TopLine=1 +LeftChar=1 [Editor_3] Open=0 Top=0 @@ -31,3 +40,9 @@ Top=0 [Editor_8] Open=0 Top=0 +[Editor_9] +Open=0 +Top=0 +[Editor_10] +Open=0 +Top=0