summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2005-02-16 22:28:04 +0000
committerleo2005-02-16 22:28:04 +0000
commit133b15c11d5f0e7b7b0b51196a19405abccf6da6 (patch)
tree29b9f45eff257978b065200c974d7e136c75d728
parent5d8f2105f7408c8178d48bb1de3c12e191e270a5 (diff)
New version tag.
git-svn-id: http://svn.leocad.org/trunk@381 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/project.cpp2
-rw-r--r--config.mk3
-rw-r--r--version.mk13
-rw-r--r--win/LeoCAD.dsp5
-rw-r--r--win/LeoCAD.rc5
-rw-r--r--win/aboutdlg.cpp4
-rw-r--r--win/config.h7
-rw-r--r--win/resource.h3
8 files changed, 23 insertions, 19 deletions
diff --git a/common/project.cpp b/common/project.cpp
index 6318635..2729f53 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -239,7 +239,7 @@ bool Project::Initialize(int argc, char *argv[], char* binpath, char* libpath)
highlight = true;
else if ((strcmp (param, "-v") == 0) || (strcmp (param, "--version") == 0))
{
- printf ("LeoCAD version "LC_VERSION" for "LC_VERSION_OSNAME"\n");
+ printf ("LeoCAD version " LC_VERSION_TEXT LC_VERSION_TAG " for "LC_VERSION_OSNAME"\n");
printf ("Copyright (c) 1996-2003, BT Software\n");
printf ("Compiled "__DATE__"\n");
diff --git a/config.mk b/config.mk
index 92947ba..23d71cb 100644
--- a/config.mk
+++ b/config.mk
@@ -79,7 +79,8 @@ config:
@echo "#define LC_VERSION_MINOR $(MINOR)" >> $(OSDIR)/config.h
@echo "#define LC_VERSION_PATCH $(PATCHLVL)" >> $(OSDIR)/config.h
@echo "#define LC_VERSION_OSNAME \"$(shell uname)\"" >> $(OSDIR)/config.h
- @echo "#define LC_VERSION \"$(MAJOR).$(MINOR).$(PATCHLVL)\"" >> $(OSDIR)/config.h
+ @echo "#define LC_VERSION_TEXT \"$(MAJOR).$(MINOR).$(PATCHLVL)\"" >> $(OSDIR)/config.h
+ @echo "#define LC_VERSION_TAG \"$(VERSIONTAG)\"" >> $(OSDIR)/config.h
@echo "#define LC_INSTALL_PREFIX \"$(PREFIX)\"" >> $(OSDIR)/config.h
@echo "" >> $(OSDIR)/config.h
diff --git a/version.mk b/version.mk
index 9bd761a..b619727 100644
--- a/version.mk
+++ b/version.mk
@@ -1,14 +1,5 @@
-# $Id$
-#
MAJOR := 0
-MINOR := 73
+MINOR := 74
PATCHLVL := 0
+VERSIONTAG := beta
VERSION := $(MAJOR).$(MINOR).$(PATCHLVL)
-
-
-
-
-
-
-
-
diff --git a/win/LeoCAD.dsp b/win/LeoCAD.dsp
index d9582da..7bf6a8d 100644
--- a/win/LeoCAD.dsp
+++ b/win/LeoCAD.dsp
@@ -1124,6 +1124,11 @@ SOURCE=..\common\view.h
# PROP Default_Filter "c;cpp"
# Begin Source File
+SOURCE=..\common\algebra.cpp
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
SOURCE=..\Common\camera.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index f80bb28..7abcf2a 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -600,8 +600,9 @@ CAPTION "About LeoCAD"
FONT 8, "MS Sans Serif"
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
- LTEXT "LeoCAD Version 0.73",IDC_STATIC,40,10,119,8,SS_NOPREFIX
- LTEXT "Copyright © 1996-2002, BT Software",IDC_STATIC,40,25,
+ LTEXT "LeoCAD Version x.xx",IDC_ABTDLG_VERSION,40,10,119,8,
+ SS_NOPREFIX
+ LTEXT "Copyright © 1996-2005, BT Software",IDC_STATIC,40,25,
119,8
DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP
GROUPBOX "System Information",IDC_STATIC,7,85,203,50
diff --git a/win/aboutdlg.cpp b/win/aboutdlg.cpp
index d883bab..0d64b90 100644
--- a/win/aboutdlg.cpp
+++ b/win/aboutdlg.cpp
@@ -4,6 +4,7 @@
#include "stdafx.h"
#include "leocad.h"
#include "AboutDlg.h"
+#include "config.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -115,6 +116,9 @@ BOOL CAboutDlg::OnInitDialog()
AdjustHomepageWindow();
+ // Fix the version number.
+ SetDlgItemText(IDC_ABTDLG_VERSION, "LeoCAD Version " LC_VERSION_TEXT LC_VERSION_TAG);
+
return TRUE;
}
diff --git a/win/config.h b/win/config.h
index 746273e..8e36d40 100644
--- a/win/config.h
+++ b/win/config.h
@@ -8,10 +8,11 @@
#define _CONFIG_H_
#define LC_VERSION_MAJOR 0
-#define LC_VERSION_MINOR 73
-#define LC_VERSION_PATCH 2
+#define LC_VERSION_MINOR 74
+#define LC_VERSION_PATCH 0
#define LC_VERSION_OSNAME "Windows"
-#define LC_VERSION "0.73.2"
+#define LC_VERSION_TEXT "0.74"
+#define LC_VERSION_TAG "-beta"
#define LC_INSTALL_PREFIX "C:\\leocad"
typedef signed char lcint8;
diff --git a/win/resource.h b/win/resource.h
index 20e348c..9252bd8 100644
--- a/win/resource.h
+++ b/win/resource.h
@@ -432,6 +432,7 @@
#define IDC_MF_LEGLSPIN 1242
#define IDC_KEYDLG_FILENAME 1242
#define IDC_MF_LEGRSPIN 1243
+#define IDC_ABTDLG_VERSION 1243
#define IDC_MF_SHOELSPIN 1244
#define IDC_MF_SHOERSPIN 1245
#define ID_EDIT_SELECTALL 32772
@@ -669,7 +670,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 235
#define _APS_NEXT_COMMAND_VALUE 33158
-#define _APS_NEXT_CONTROL_VALUE 1243
+#define _APS_NEXT_CONTROL_VALUE 1244
#define _APS_NEXT_SYMED_VALUE 121
#endif
#endif