Support for Ansi builds removed

* UNICODE option removed from flamerobin.bkl, Windows build files rebaked. * Inno Setup script file edited to install Unicode executable only.
mariuz · Oct 3, 2013 · 2e2566a · 2e2566a
1 parent cd76bbc
commit 2e2566a
Show file tree

Hide file tree

Showing 11 changed files with 693 additions and 2,696 deletions.
diff --git a/BUILD.txt b/BUILD.txt
@@ -39,6 +39,18 @@ following Stack Overflow post about how to build Boost in both versions:
   http://stackoverflow.com/a/2326485/30568
   (accepted answer to "64-bit version of Boost for 64-bit windows")
 
+For the sole purpose of building FlameRobin only a few libraries are needed,
+and only the version for static linking, so the following invocations are
+all that is needed:
+
+  bjam link=static --with-thread --with-date_time --with-system stage
+
+(for 32 bit build) and
+
+  bjam address-model=64 link=static --with-thread --with-date_time --with-system stage
+
+(for 64 bit build).
+
 For other systems the configure script checks for the used header files and
 libraries of Boost. On Debian and Ubuntu use the following commands to
 install the headers and thread library:

diff --git a/Bakefiles.bkgen b/Bakefiles.bkgen
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 
 <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
 

diff --git a/flamerobin.bkl b/flamerobin.bkl
@@ -21,16 +21,8 @@
         <if cond="USEDLL=='1'">WXUSINGDLL</if>
     </set>
 
-<!-- this option allows to build the application with either the
-     Ansi or Unicode configuration of wxWidgets -->
-    <option name="UNICODE">
-        <values>1</values>
-        <values-description>,Unicode</values-description>
-        <default-value>1</default-value>
-    </option>
-    <set var="U_OPT">
-        <if cond="UNICODE=='1'">u</if>
-    </set>
+<!-- Unicode only from now on -->
+    <set var="U_OPT">u</set>
 
 <!-- this option allows to build the application with either the
      Debug or Release configuration of wxWidgets and IBPP -->
@@ -67,7 +59,7 @@
     </set>
 
 <!-- this option allows to build the application for WIN64 -->
-    <if cond="FORMAT in ['msvc','msvs2008prj']">
+    <if cond="FORMAT in ['msvc','msvc6prj','msvs2008prj']">
         <option name="TARGET_CPU">
             <default-value>$(DOLLAR)(CPU)</default-value>
             <description>
@@ -81,7 +73,7 @@ Accepted values: AMD64, IA64.
             </description>
         </option>
     </if>
-    <if cond="not (FORMAT in ['msvc','msvs2008'])">
+    <if cond="not (FORMAT in ['msvc','msvc6prj','msvs2008'])">
         <set var="TARGET_CPU"/>
     </if>
     <set var="DIR_SUFFIX_CPU">
@@ -99,7 +91,7 @@ Accepted values: AMD64, IA64.
 
 
     <define-tag name="headers" rules="dll,lib,exe">
-        <if cond="FORMAT in ['msvs2008prj']">
+        <if cond="FORMAT in ['msvc6prj','msvs2008prj']">
             <msvc-project-files>
                 $(value)
             </msvc-project-files>
@@ -116,7 +108,7 @@ Accepted values: AMD64, IA64.
         <debug-info>$(DEBUGINFO)</debug-info>
         <optimize>$(OPTIMIZE)</optimize>
 
-        <if cond="FORMAT in ['msvc','msvs2008prj']">
+        <if cond="FORMAT in ['msvc6prj','msvc','msvs2008prj']">
             <ldflags>/nologo</ldflags>
             <ldflags>/subsystem:windows</ldflags>
             <ldflags>$(LINK_TARGET_CPU)</ldflags>
@@ -169,7 +161,7 @@ Accepted values: AMD64, IA64.
             <define>HAVE_W32API_H</define>
         </if>
 
-        <if cond="FORMAT in ['mingw','msvc','msvs2008prj']">
+        <if cond="FORMAT in ['mingw','msvc6prj','msvc','msvs2008prj']">
             <define>_WINDOWS</define>
             <define>__WINDOWS__</define>
             <define>WINVER=0x400</define>
@@ -181,12 +173,12 @@ Accepted values: AMD64, IA64.
             <define>__WXMSW__</define>
             <define>wxUSE_GUI=1</define>
             <define>wxUSE_REGEX=1</define>
-            <define>wxUSE_UNICODE=$(UNICODE)</define>
+            <define>wxUSE_UNICODE=1</define>
             <define>WIN32_LEAN_AND_MEAN</define>
 
             <set var="WX_PORT">wxmsw</set>
 <!-- set this to 28 for wxWidgets 2.8.X, to 29 for wxWidgets 2.9.x-->
-            <set var="WX_VERSION">29</set>
+            <set var="WX_VERSION">28</set>
 
             <set var="WX_LIB_DIR" make_var="1">
                 <if cond="USEDLL=='1'">$(WXDIR)/lib/$(COMPILER)$(DIR_SUFFIX_CPU)_dll</if>
@@ -638,7 +630,7 @@ Accepted values: AMD64, IA64.
         </modify-target>
     </define-tag>
 
-    <if cond="not (FORMAT in ['msvs2008prj'])">
+    <if cond="not (FORMAT in ['msvc6prj','msvs2008prj'])">
         <set var="REVISION_INFO_SCRIPT">
             <if cond="FORMAT=='autoconf'">cd $(DOLLAR)(srcdir) &amp;&amp; ./update-revision-info.sh</if>
             <if cond="FORMAT!='autoconf'">update-revision-info.cmd</if>

diff --git a/flamerobin.sln b/flamerobin.sln
@@ -14,18 +14,10 @@ Global
 		Debug Static|Win32 = Debug Static|Win32
 		Release Dynamic|Win32 = Release Dynamic|Win32
 		Release Static|Win32 = Release Static|Win32
-		Unicode Debug Dynamic|Win32 = Unicode Debug Dynamic|Win32
-		Unicode Debug Static|Win32 = Unicode Debug Static|Win32
-		Unicode Release Dynamic|Win32 = Unicode Release Dynamic|Win32
-		Unicode Release Static|Win32 = Unicode Release Static|Win32
 		DLL Debug Dynamic|Win32 = DLL Debug Dynamic|Win32
 		DLL Debug Static|Win32 = DLL Debug Static|Win32
 		DLL Release Dynamic|Win32 = DLL Release Dynamic|Win32
 		DLL Release Static|Win32 = DLL Release Static|Win32
-		DLL Unicode Debug Dynamic|Win32 = DLL Unicode Debug Dynamic|Win32
-		DLL Unicode Debug Static|Win32 = DLL Unicode Debug Static|Win32
-		DLL Unicode Release Dynamic|Win32 = DLL Unicode Release Dynamic|Win32
-		DLL Unicode Release Static|Win32 = DLL Unicode Release Static|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32
@@ -36,14 +28,6 @@ Global
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.ActiveCfg = Release Static|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.Build.0 = Release Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Unicode Debug Dynamic|Win32.ActiveCfg = Unicode Debug Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Unicode Debug Dynamic|Win32.Build.0 = Unicode Debug Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Unicode Debug Static|Win32.ActiveCfg = Unicode Debug Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Unicode Debug Static|Win32.Build.0 = Unicode Debug Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Unicode Release Dynamic|Win32.ActiveCfg = Unicode Release Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Unicode Release Dynamic|Win32.Build.0 = Unicode Release Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Unicode Release Static|Win32.ActiveCfg = Unicode Release Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Unicode Release Static|Win32.Build.0 = Unicode Release Static|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Dynamic|Win32.ActiveCfg = DLL Debug Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Dynamic|Win32.Build.0 = DLL Debug Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Static|Win32.ActiveCfg = DLL Debug Static|Win32
@@ -52,14 +36,6 @@ Global
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Dynamic|Win32.Build.0 = DLL Release Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Static|Win32.ActiveCfg = DLL Release Static|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Static|Win32.Build.0 = DLL Release Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Unicode Debug Dynamic|Win32.ActiveCfg = DLL Unicode Debug Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Unicode Debug Dynamic|Win32.Build.0 = DLL Unicode Debug Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Unicode Debug Static|Win32.ActiveCfg = DLL Unicode Debug Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Unicode Debug Static|Win32.Build.0 = DLL Unicode Debug Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Unicode Release Dynamic|Win32.ActiveCfg = DLL Unicode Release Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Unicode Release Dynamic|Win32.Build.0 = DLL Unicode Release Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Unicode Release Static|Win32.ActiveCfg = DLL Unicode Release Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Unicode Release Static|Win32.Build.0 = DLL Unicode Release Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|Win32.Build.0 = Debug Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
@@ -68,14 +44,6 @@ Global
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.ActiveCfg = Release Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.Build.0 = Release Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Unicode Debug Dynamic|Win32.ActiveCfg = Unicode Debug Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Unicode Debug Dynamic|Win32.Build.0 = Unicode Debug Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Unicode Debug Static|Win32.ActiveCfg = Unicode Debug Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Unicode Debug Static|Win32.Build.0 = Unicode Debug Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Unicode Release Dynamic|Win32.ActiveCfg = Unicode Release Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Unicode Release Dynamic|Win32.Build.0 = Unicode Release Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Unicode Release Static|Win32.ActiveCfg = Unicode Release Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Unicode Release Static|Win32.Build.0 = Unicode Release Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Dynamic|Win32.ActiveCfg = DLL Debug Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Dynamic|Win32.Build.0 = DLL Debug Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Static|Win32.ActiveCfg = DLL Debug Static|Win32
@@ -84,14 +52,6 @@ Global
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Dynamic|Win32.Build.0 = DLL Release Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Static|Win32.ActiveCfg = DLL Release Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Static|Win32.Build.0 = DLL Release Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Unicode Debug Dynamic|Win32.ActiveCfg = DLL Unicode Debug Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Unicode Debug Dynamic|Win32.Build.0 = DLL Unicode Debug Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Unicode Debug Static|Win32.ActiveCfg = DLL Unicode Debug Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Unicode Debug Static|Win32.Build.0 = DLL Unicode Debug Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Unicode Release Dynamic|Win32.ActiveCfg = DLL Unicode Release Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Unicode Release Dynamic|Win32.Build.0 = DLL Unicode Release Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Unicode Release Static|Win32.ActiveCfg = DLL Unicode Release Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Unicode Release Static|Win32.Build.0 = DLL Unicode Release Static|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE