Menu
▾
▴
[Wxdevide-svn] SF.net SVN: wxdevide:[22] trunk/wxdevide/source
|
From: <tb...@us...> - 2012-02-26 18:53:37
|
Revision: 22
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=22&view=rev
Author: tbreina
Date: 2012-02-26 18:53:31 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
Update project to work with wxDev-C++ 7.4.2
Modified Paths:
--------------
trunk/wxdevide/source/Compiler.h
trunk/wxdevide/source/DevCpp.dev
trunk/wxdevide/source/DevCpp.layout
trunk/wxdevide/source/Makefile.win
trunk/wxdevide/source/devMonitorTypes.h
Modified: trunk/wxdevide/source/Compiler.h
===================================================================
--- trunk/wxdevide/source/Compiler.h 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/Compiler.h 2012-02-26 18:53:31 UTC (rev 22)
@@ -70,7 +70,7 @@
static const wxString RmExe = wxT("rm -f");
-typedef enum TTarget { ctNone, ctFile, ctProject };
+enum TTarget { ctNone, ctFile, ctProject };
class TCompiler
{
Modified: trunk/wxdevide/source/DevCpp.dev
===================================================================
--- trunk/wxdevide/source/DevCpp.dev 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/DevCpp.dev 2012-02-26 18:53:31 UTC (rev 22)
@@ -6,7 +6,7 @@
PchSource=-1
Ver=3
IsCpp=1
-ProfilesCount=3
+ProfilesCount=2
ProfileIndex=0
Folders=
@@ -30,7 +30,7 @@
AutoIncBuildNrOnCompile=0
[Profile1]
-ProfileName=MingW gcc 3.4.5
+ProfileName=MingW gcc
Type=0
ObjFiles=
Includes=
@@ -58,34 +58,6 @@
CompilerType=0
[Profile2]
-ProfileName=Visual C++ 2005
-Type=0
-ObjFiles=
-Includes=
-Libs=
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=
-Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_
-PreprocDefines=_@@_
-CompilerSettings=000000000000010000000000000000000000
-Icon=
-ExeOutput=Output\Visual C++ 2005
-ImagesOutput=Images\
-ObjectOutput=Objects\Visual C++ 2005
-OverrideOutput=0
-OverrideOutputName=
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=1
-CompilerType=1
-
-[Profile3]
ProfileName=MS Visual C++
Type=0
ObjFiles=
@@ -103,15 +75,15 @@
ImagesOutput=Images\
ObjectOutput=Objects\Visual C++
OverrideOutput=0
-OverrideOutputName=
+OverrideOutputName=DevCpp.exe
HostApplication=
CommandLine=
UseCustomMakefile=0
CustomMakefile=
IncludeVersionInfo=0
SupportXPThemes=0
-CompilerSet=5
-CompilerType=5
+CompilerSet=9
+CompilerType=9
[Unit1]
FileName=AboutDlg.cpp
Modified: trunk/wxdevide/source/DevCpp.layout
===================================================================
--- trunk/wxdevide/source/DevCpp.layout 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/DevCpp.layout 2012-02-26 18:53:31 UTC (rev 22)
@@ -88,9 +88,9 @@
[Editor_12]
Open=0
Top=0
-CursorCol=1
-CursorRow=1
-TopLine=1
+CursorCol=10
+CursorRow=71
+TopLine=64
LeftChar=1
[Editor_13]
Open=0
@@ -186,7 +186,7 @@
[Editor_26]
Open=0
Top=0
-CursorCol=34
+CursorCol=1
CursorRow=35
TopLine=22
LeftChar=1
@@ -207,9 +207,9 @@
[Editor_29]
Open=0
Top=0
-CursorCol=1
-CursorRow=6
-TopLine=1
+CursorCol=12
+CursorRow=26
+TopLine=3
LeftChar=1
[Editor_30]
Open=0
@@ -242,9 +242,9 @@
[Editor_34]
Open=0
Top=0
-CursorCol=55
-CursorRow=66
-TopLine=40
+CursorCol=32
+CursorRow=3543
+TopLine=3523
LeftChar=1
[Editor_35]
Open=0
@@ -417,8 +417,8 @@
[Editor_59]
Open=1
Top=0
-CursorCol=1
-CursorRow=10
+CursorCol=24
+CursorRow=28
TopLine=10
LeftChar=1
[Editor_60]
@@ -494,9 +494,9 @@
[Editor_70]
Open=0
Top=0
-CursorCol=32
-CursorRow=22
-TopLine=30
+CursorCol=5
+CursorRow=13
+TopLine=5
LeftChar=1
[Editor_71]
Open=0
@@ -508,15 +508,15 @@
[Editor_72]
Open=0
Top=0
-CursorCol=72
-CursorRow=24
-TopLine=1
+CursorCol=26
+CursorRow=36
+TopLine=19
LeftChar=1
[Editor_73]
Open=1
Top=1
-CursorCol=1
-CursorRow=1805
+CursorCol=10
+CursorRow=1792
TopLine=1786
LeftChar=1
[Editor_74]
Modified: trunk/wxdevide/source/Makefile.win
===================================================================
--- trunk/wxdevide/source/Makefile.win 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/Makefile.win 2012-02-26 18:53:31 UTC (rev 22)
@@ -1,7 +1,7 @@
# Project: wxDevIDE
# Compiler: Default GCC compiler
# Compiler Type: MingW 3
-# Makefile created by wxDev-C++ wxDev-C++ IDE 7.4.1.42 on 07/01/12 19:58
+# Makefile created by wxDev-C++ IDE 7.4.2.140 on 26/02/12 10:48
WXLIBNAME = wxmsw29u
CPP = g++.exe
@@ -9,23 +9,29 @@
WINDRES = "windres.exe"
OBJ = Objects/MingW/AboutDlg.o Objects/MingW/AddToDoFrm.o Objects/MingW/CFGData.o Objects/MingW/ColorEditDlg.o Objects/MingW/Compiler.o Objects/MingW/CompilerFunctions.o Objects/MingW/CustomComponents.o Objects/MingW/DelphiSub.o Objects/MingW/DevCfg.o Objects/MingW/devcppApp.o Objects/MingW/devFileMonitor.o Objects/MingW/devFileMonitorThread.o Objects/MingW/DevResource.o Objects/MingW/DevTheme.o Objects/MingW/Editor.o Objects/MingW/EditorOptfrm.o Objects/MingW/ELDsgnr.o Objects/MingW/EnviroFrm.o Objects/MingW/FileAssocs.o Objects/MingW/FilePropertiesfrm.o Objects/MingW/GotoLineFrm.o Objects/MingW/LangFrm.o Objects/MingW/Macros.o Objects/MingW/MainFrm.o Objects/MingW/MultiLangSupport.o Objects/MingW/NewProjectFrm.o Objects/MingW/oysUtils.o Objects/MingW/PrjTypes.o Objects/MingW/Project.o Objects/MingW/SearchCenter.o Objects/MingW/SplashFrm.o Objects/MingW/Template.o Objects/MingW/ToolEditForm.o Objects/MingW/ToolEditFrm.o Objects/MingW/ToolFrm.o Objects/MingW/Utils.o Objects/MingW/WebUpdateDlg.o Objects/MingW/CompileProgressForm.o Objects/MingW/DevCpp_private.res
LINKOBJ = "Objects/MingW/AboutDlg.o" "Objects/MingW/AddToDoFrm.o" "Objects/MingW/CFGData.o" "Objects/MingW/ColorEditDlg.o" "Objects/MingW/Compiler.o" "Objects/MingW/CompilerFunctions.o" "Objects/MingW/CustomComponents.o" "Objects/MingW/DelphiSub.o" "Objects/MingW/DevCfg.o" "Objects/MingW/devcppApp.o" "Objects/MingW/devFileMonitor.o" "Objects/MingW/devFileMonitorThread.o" "Objects/MingW/DevResource.o" "Objects/MingW/DevTheme.o" "Objects/MingW/Editor.o" "Objects/MingW/EditorOptfrm.o" "Objects/MingW/ELDsgnr.o" "Objects/MingW/EnviroFrm.o" "Objects/MingW/FileAssocs.o" "Objects/MingW/FilePropertiesfrm.o" "Objects/MingW/GotoLineFrm.o" "Objects/MingW/LangFrm.o" "Objects/MingW/Macros.o" "Objects/MingW/MainFrm.o" "Objects/MingW/MultiLangSupport.o" "Objects/MingW/NewProjectFrm.o" "Objects/MingW/oysUtils.o" "Objects/MingW/PrjTypes.o" "Objects/MingW/Project.o" "Objects/MingW/SearchCenter.o" "Objects/MingW/SplashFrm.o" "Objects/MingW/Template.o" "Objects/MingW/ToolEditForm.o" "Objects/MingW/ToolEditFrm.o" "Objects/MingW/ToolFrm.o" "Objects/MingW/Utils.o" "Objects/MingW/WebUpdateDlg.o" "Objects/MingW/CompileProgressForm.o" Objects/MingW/DevCpp_private.res
-LIBS = -L"H:/TDM-MinGW32/lib" -L"H:/wxWidgets-2.9.3/lib/gcc_lib" -mwindows -l$(WXLIBNAME) -l$(WXLIBNAME)_gl -lwxscintilla -lwxtiff -lwxjpeg -lwxpng -lwxzlib -lwxregexu -lwxexpat -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 -lopengl32
-INCS = -I"C:/Program Files/Dev-Cpp/Include"
-CXXINCS = -I"H:/TDM-MinGW32/include" -I"H:/wxWidgets-2.9.3/include"
-RCINCS = --include-dir "H:/WXWIDG~1.3/include"
+LIBS = -L"C:/Program Files (x86)/Dev-Cpp/lib/wx/gcc_lib" -L"C:/Program Files (x86)/Dev-Cpp/lib" -L"C:/Program Files (x86)/Dev-Cpp/MinGW32/lib" -mwindows -l$(WXLIBNAME) -l$(WXLIBNAME)_gl -lwxscintilla -lwxtiff -lwxjpeg -lwxpng -lwxzlib -lwxregexu -lwxexpat -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 -lopengl32
+INCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include"
+CXXINCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include" -I"C:/Program Files (x86)/Dev-Cpp/include/common"
+RCINCS = --include-dir "C:/PROGRA~2/Dev-Cpp/include/common"
BIN = Output/MingW/DevCpp.exe
DEFINES = -D__WXMSW__ -D__GNUWIN32__ -DwxUSE_UNICODE
CXXFLAGS = $(CXXINCS) $(DEFINES) -fexpensive-optimizations -O3
CFLAGS = $(INCS) $(DEFINES) -fexpensive-optimizations -O3
GPROF = gprof.exe
-RM = rm -f
+ifeq ($(OS),Windows_NT)
+ RM = del /Q
+ FixPath = $(subst /,\,$1)
+else
+ RM = rm -f
+ FixPath = $1
+endif
LINK = g++.exe
.PHONY: all all-before all-after clean clean-custom
all: all-before $(BIN) all-after
clean: clean-custom
- $(RM) $(LINKOBJ) "$(BIN)"
+ $(RM) $(call FixPath,$(LINKOBJ)) "$(call FixPath,$(BIN))"
$(BIN): $(OBJ)
$(LINK) $(LINKOBJ) -o "$(BIN)" $(LIBS)
Modified: trunk/wxdevide/source/devMonitorTypes.h
===================================================================
--- trunk/wxdevide/source/devMonitorTypes.h 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/devMonitorTypes.h 2012-02-26 18:53:31 UTC (rev 22)
@@ -28,7 +28,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-typedef enum TdevMonitorChangeType { mctChanged, mctDeleted };
+enum TdevMonitorChangeType { mctChanged, mctDeleted };
//typedef void (*TdevMonitorChange)(TObject Sender, TdevMonitorChangeType ChangeType, std::string Filename) /* of class: object *//*?*/;
#endif//DEV_MONITOR_TYPES_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|