From 5ee55b039c92e242ee19884954e9a46b93816e79 Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Sat, 11 Aug 2007 17:34:17 +0000 Subject: [PATCH] Removed old Microsoft Visual Studio C++ files (in 'visualc'). Created a new "win32" folder with (most of the) things from 'visualc' that are still being used ('resource.h', 'resources.rc' and 'tuxpaint.iss'). --- docs/CHANGES.txt | 7 + visualc/README.txt | 124 ---------- visualc/TuxPaint.dsp | 396 -------------------------------- visualc/TuxPaint.dsw | 29 --- visualc/options.ini | 59 ----- visualc/tuxpaint.cfg | 0 visualc/userdata/current_id.txt | 1 - {visualc => win32}/resource.h | 0 {visualc => win32}/resources.rc | 0 {visualc => win32}/tuxpaint.iss | 0 10 files changed, 7 insertions(+), 609 deletions(-) delete mode 100644 visualc/README.txt delete mode 100644 visualc/TuxPaint.dsp delete mode 100644 visualc/TuxPaint.dsw delete mode 100644 visualc/options.ini delete mode 100644 visualc/tuxpaint.cfg delete mode 100644 visualc/userdata/current_id.txt rename {visualc => win32}/resource.h (100%) rename {visualc => win32}/resources.rc (100%) rename {visualc => win32}/tuxpaint.iss (100%) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 78fc58b89..7061671f9 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -180,6 +180,13 @@ $Id$ * Improved comments near gettext() calls in the source code, to provide useful descriptions of each string in the POT (translation template). + * Build System Improvements + ------------------------- + * Removed old Microsoft Visual Studio C++ files (in 'visualc') + + * Created a new "win32" folder with things from 'visualc' that are still + being used ('libdocs', 'resource.h', 'resources.rc' and 'tuxpaint.iss') + * Bug Fixes --------- * PostScript scale and translation values were being localized diff --git a/visualc/README.txt b/visualc/README.txt deleted file mode 100644 index c61dfb2c0..000000000 --- a/visualc/README.txt +++ /dev/null @@ -1,124 +0,0 @@ -Building Tux Paint using MSVC++6.0 -================================== - -Compiling Tux Paint -------------------- -You will need the tuxpaint-devel-win32.zip archive which contains the Release -and Debug .DLL and .LIB files and all headers required to build Tux Paint on -Windows. - -The source-code and binaries are available here: -[somewhere on the Tux Paint web site] - -Then set up an area of your disk something like this: - -C:\dev\tuxpaint\ # cvs files here -C:\dev\tuxpaint-config\ # cvs files here -C:\dev\lib\ # release dll, lib -C:\dev\libd\ # debug dll, lib -C:\dev\include\ # header files - -You need Python 2.3.3 or later installed (might work with earlier versions). -Copy 'iconv.dll', 'libintl.dll' and 'msgfmt.exe' into the visualc directory. -Using a DOS box or Command-Prompt cd into visualc dir and run -'python prebuild.py'. This will format the text documentation, build the -.mo I18N files, and build a filelist used by the NSIS installer. - -Copy the following DLLs from lib/libd into Release/Debug output -directories respectively: - -iconv.dll -jpeg.dll -libintl.dll -libpng1.dll -SDL.dll -sdl_image.dll -SDL_mixer.dll -SDL_ttf.dll -smpeg.dll -zlib.dll - -Double click on the 'TuxPaint.dsw' workspace file which will start-up -Visual Studio. - -Select 'Batch Build...' from the 'Build' menu and click on "Rebuild All". - -If you want to run Tux Paint from inside Visual Studio (usefull!) then you -need to edit tuxpaint.c at around line 139: - -/* Set this to 0 during developement and testing in Visual-Studio - Set this to 1 to make the final executable */ - -#if 1 - -#define DOC_PREFIX "docs/" -#define DATA_PREFIX "data/" -#define LOCALEDIR "locale" - -#else - -#define DOC_PREFIX "../../docs/" -#define DATA_PREFIX "../../data/" -#define LOCALEDIR "../../locale" - -#endif /* 1/0 */ - -Before you use the NSIS installer make sure that this is changed back to a 1 -and that you have rebuilt the project. - -In addition, you need to set the working directory for the project: Select -Project|Settings from the menu and select the Debug tab (even if you want -to run the Release version). If you have already built the executables, you -will be able to cut-n-paste the path from the "Executable for debug session:" -box into the "" box. - -Note: you can also supply command-line arguments to Tux Paint here - useful -for testing the different languages quickly. - -Unfortunately, due to the layout of files in CVS, the stamps, starter -images, custom local fonts and locales, aren't in the right place to allow Tux -Paint to find them. This will probably be fixed at some point, but for now just -move the folders about. DONT try and update cvs, and DONT try and build an -installer if you have moved the folders. The technique I'm using at the moment -is to have a 'cvs' and a 'build' copy of the whole thing - ugly and error prone, -but it does allow testing and debugging to take place easily. - - -Compiling Tux Paint Config --------------------------- -This is the simpler of the two projects, and depends on the FLTK library, -which is statically linked, and 'libintl.dll' which depends on 'iconv.dll'. -In normal use, these DLLs are shared with Tux Paint itself. - -Copy the following DLLs from lib/libd into Release/Debug output -directories respectively: - -iconv.dll -libintl.dll - -As before, use a DOS box to run the command 'python prebuild.py', then click -on the 'tuxpaintconfig.dsw' project workspace file. - -Select 'Batch Build...' from the 'Build' menu and click on "Rebuild All". - - -NSIS ----- -You need to have downloaded and installed NSIS-2 from here: -http://nsis.sourceforge.net/ - -The NSIS script, 'tuxpaint.nsi', requires that both tuxpaint and -tuxpaint-config have already been compiled - I haven't put together any kind -of 'Make' system here. - -The easiest way of running the script is to right-click on it in the Windows -Explorer and choose "Compile NSIS Script". The compression defaults to -LZMA, which consistantly gaves the best results (smallest installer). - -The first few lines in 'tuxpaint.nsi' currently need manual editing to make -sure that the installer has the right name (this keeps bill happy:-) - -John Popplewell. -john@johnnypops.demon.co.uk -http://www.johnnypops.demon.co.uk/ -$Id$ diff --git a/visualc/TuxPaint.dsp b/visualc/TuxPaint.dsp deleted file mode 100644 index dfb535b67..000000000 --- a/visualc/TuxPaint.dsp +++ /dev/null @@ -1,396 +0,0 @@ -# Microsoft Developer Studio Project File - Name="TuxPaint" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=TuxPaint - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TuxPaint.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TuxPaint.mak" CFG="TuxPaint - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TuxPaint - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "TuxPaint - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TuxPaint - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O1 /I "..\..\include" /I "..\visualc" /I "..\src\mouse" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 iconv.lib libpng1.lib libintl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib sdl_ttf.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\lib" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "TuxPaint - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /Op /I "..\..\include" /I "..\visualc" /I "..\src\mouse" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 iconv.lib libpng1.lib libintl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib sdl_ttf.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libd" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "TuxPaint - Win32 Release" -# Name "TuxPaint - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\hq4x.c -# End Source File -# Begin Source File - -SOURCE=..\src\hqxx.c -# End Source File -# Begin Source File - -SOURCE=..\src\tuxpaint.c -# End Source File -# Begin Source File - -SOURCE=..\src\win32_dirent.c -# End Source File -# Begin Source File - -SOURCE=..\src\win32_print.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\src\mouse\arrow-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\arrow.xbm -# End Source File -# Begin Source File - -SOURCE=D:\Dx8sdk\include\basetsd.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\begin_code.h -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\brush-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\brush.xbm -# End Source File -# Begin Source File - -SOURCE=..\..\include\close_code.h -# End Source File -# Begin Source File - -SOURCE=..\src\colors.h -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\crosshair-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\crosshair.xbm -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\down-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\down.xbm -# End Source File -# Begin Source File - -SOURCE=..\src\great.h -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\hand-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\hand.xbm -# End Source File -# Begin Source File - -SOURCE=..\src\hq3x.h -# End Source File -# Begin Source File - -SOURCE=..\src\hq4x.h -# End Source File -# Begin Source File - -SOURCE=..\src\hqxx.h -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\insertion-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\insertion.xbm -# End Source File -# Begin Source File - -SOURCE=..\..\include\libintl.h -# End Source File -# Begin Source File - -SOURCE=..\src\magic.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\png.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\pngconf.h -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\rotate-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\rotate.xbm -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_active.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_audio.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_byteorder.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_cdrom.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_error.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_events.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_getenv.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_image.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_joystick.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_keyboard.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_keysym.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_main.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_mixer.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_mouse.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_mutex.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_quit.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_rwops.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_syswm.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_timer.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_ttf.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_types.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_version.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\SDL_video.h -# End Source File -# Begin Source File - -SOURCE=..\src\shapes.h -# End Source File -# Begin Source File - -SOURCE=..\src\sounds.h -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\tiny-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\tiny.xbm -# End Source File -# Begin Source File - -SOURCE=..\src\tip_tux.h -# End Source File -# Begin Source File - -SOURCE=..\src\titles.h -# End Source File -# Begin Source File - -SOURCE=..\src\tools.h -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\up-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\up.xbm -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\wand-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\wand.xbm -# End Source File -# Begin Source File - -SOURCE="..\src\mouse\watch-mask.xbm" -# End Source File -# Begin Source File - -SOURCE=..\src\mouse\watch.xbm -# End Source File -# Begin Source File - -SOURCE=..\src\win32_dirent.h -# End Source File -# Begin Source File - -SOURCE=..\src\win32_print.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\zconf.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\zlib.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE="..\data\images\icon-win32.ico" -# End Source File -# Begin Source File - -SOURCE=.\resources.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/visualc/TuxPaint.dsw b/visualc/TuxPaint.dsw deleted file mode 100644 index c8f607a57..000000000 --- a/visualc/TuxPaint.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "TuxPaint"=".\TuxPaint.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/visualc/options.ini b/visualc/options.ini deleted file mode 100644 index 509b35db0..000000000 --- a/visualc/options.ini +++ /dev/null @@ -1,59 +0,0 @@ -[Settings] -NumFields=6 - -[Field 1] -Type=LABEL -Text=" Start Tux Paint with these options: " -Left=0 -Right=-1 -Top=0 -Bottom=35 - -[Field 2] -Type=GroupBox -Left=50 -Right=-50 -Top=36 -Bottom=78 -Text=" Display: " - -[Field 3] -Type=LABEL -Text=Mode: -Left=58 -Right=100 -Top=46 -Bottom=55 -State=1 -Flags=NOTABSTOP - -[Field 4] -Type=DROPLIST -ListItems=Windowed|Full-Screen -State=Full-Screen -Left=115 -Right=-55 -Top=44 -Bottom=80 -Flags=NOTABSTOP - -[Field 5] -Type=LABEL -Text=Resolution: -Left=58 -Right=100 -Top=62 -Bottom=71 -State=1 -Flags=NOTABSTOP - -[Field 6] -Type=DROPLIST -ListItems=640x480|800x600 -State=800x600 -Left=115 -Right=-55 -Top=60 -Bottom=96 -Flags=NOTABSTOP - diff --git a/visualc/tuxpaint.cfg b/visualc/tuxpaint.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/visualc/userdata/current_id.txt b/visualc/userdata/current_id.txt deleted file mode 100644 index 8b1378917..000000000 --- a/visualc/userdata/current_id.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/visualc/resource.h b/win32/resource.h similarity index 100% rename from visualc/resource.h rename to win32/resource.h diff --git a/visualc/resources.rc b/win32/resources.rc similarity index 100% rename from visualc/resources.rc rename to win32/resources.rc diff --git a/visualc/tuxpaint.iss b/win32/tuxpaint.iss similarity index 100% rename from visualc/tuxpaint.iss rename to win32/tuxpaint.iss