Permalink
Browse files

Cleanup buildsystem and improve building with Visual Studio

This removes elements for building for wxWidgets < 2.9, most of them referenced removed elements anyway. Additionally GCC parameters dont't get passed to Visual Studio anymore.
  • Loading branch information...
sodevel committed Jul 6, 2018
1 parent 1952020 commit 413eba1848b6273c330cf1ccfa4d4d68e6643a46
@@ -20,12 +20,14 @@ project "plugin-interface"
flags {"ExtraWarnings"}
defines {"TIXML_USE_TICPP"}
targetsuffix ( "-" .. wxVersion )
buildoptions "-std=c++14"
if wxArchitecture then
buildoptions {"-arch " .. wxArchitecture}
end
configuration "not vs*"
buildoptions "-std=c++14"
configuration "not windows"
buildoptions {"-fPIC"}
@@ -38,8 +40,8 @@ configuration "Debug"
wx_config { Debug="yes", WithoutLibs="yes" }
configuration "Release"
buildoptions {"-fno-strict-aliasing"}
targetname ( CustomPrefix .. "_plugin-interface" )
wx_config { WithoutLibs="yes" }
configuration {"not vs*", "Release"}
buildoptions {"-fno-strict-aliasing"}
@@ -18,7 +18,6 @@ project "additional-components-plugin"
defines {"BUILD_DLL", "TIXML_USE_TICPP"}
flags {"ExtraWarnings"}
links {"plugin-interface", "TiCPP"}
buildoptions "-std=c++14"
local libs = "std,richtext,propgrid,stc,ribbon,aui"
if wxUseMediaCtrl then
@@ -30,6 +29,9 @@ end
buildoptions {"-arch " .. wxArchitecture}
end
configuration "not vs*"
buildoptions "-std=c++14"
configuration "not windows"
targetdir "../../../output/lib/wxformbuilder"
@@ -42,5 +44,7 @@ end
wx_config { Libs=libs, Debug="yes" }
configuration "Release"
buildoptions {"-fno-strict-aliasing"}
wx_config { Libs=libs }
configuration {"not vs*", "Release"}
buildoptions {"-fno-strict-aliasing"}
@@ -18,14 +18,16 @@ project "common-components-plugin"
defines {"BUILD_DLL", "TIXML_USE_TICPP"}
flags {"ExtraWarnings"}
links {"plugin-interface", "TiCPP"}
buildoptions "-std=c++14"
local libs = "std,richtext,propgrid,stc,ribbon,aui"
if wxArchitecture then
buildoptions {"-arch " .. wxArchitecture}
end
configuration "not vs*"
buildoptions "-std=c++14"
configuration "not windows"
targetdir "../../../output/lib/wxformbuilder"
@@ -38,5 +40,7 @@ project "common-components-plugin"
wx_config { Debug="yes", Libs=libs }
configuration "Release"
buildoptions {"-fno-strict-aliasing"}
wx_config { Libs=libs }
configuration {"not vs*", "Release"}
buildoptions {"-fno-strict-aliasing"}
@@ -18,14 +18,16 @@ project "containers-components-plugin"
defines {"BUILD_DLL", "TIXML_USE_TICPP"}
flags {"ExtraWarnings"}
links {"plugin-interface", "TiCPP"}
buildoptions "-std=c++14"
local libs = "std,richtext,propgrid,stc,ribbon,aui"
if wxArchitecture then
buildoptions {"-arch " .. wxArchitecture}
end
configuration "not vs*"
buildoptions "-std=c++14"
configuration "not windows"
targetdir "../../../output/lib/wxformbuilder"
@@ -38,5 +40,7 @@ project "containers-components-plugin"
wx_config { Debug="yes", Libs=libs }
configuration "Release"
buildoptions {"-fno-strict-aliasing"}
wx_config { Libs=libs }
configuration {"not vs*", "Release"}
buildoptions {"-fno-strict-aliasing"}
@@ -18,14 +18,16 @@ project "forms-components-plugin"
defines {"BUILD_DLL", "TIXML_USE_TICPP"}
flags {"ExtraWarnings"}
links {"plugin-interface", "TiCPP"}
buildoptions "-std=c++14"
local libs = "std,richtext,propgrid,stc,ribbon,aui"
if wxArchitecture then
buildoptions {"-arch " .. wxArchitecture}
end
configuration "not vs*"
buildoptions "-std=c++14"
configuration "not windows"
targetdir "../../../output/lib/wxformbuilder"
@@ -38,6 +40,7 @@ project "forms-components-plugin"
wx_config { Debug="yes", Libs=libs }
configuration "Release"
buildoptions {"-fno-strict-aliasing"}
wx_config { Libs=libs }
configuration {"not vs*", "Release"}
buildoptions {"-fno-strict-aliasing"}
@@ -18,14 +18,16 @@ project "layout-components-plugin"
defines {"BUILD_DLL", "TIXML_USE_TICPP"}
flags {"ExtraWarnings"}
links {"plugin-interface", "TiCPP"}
buildoptions "-std=c++14"
local libs = "std,richtext,propgrid,stc,ribbon,aui"
if wxArchitecture then
buildoptions {"-arch " .. wxArchitecture}
end
configuration "not vs*"
buildoptions "-std=c++14"
configuration "not windows"
targetdir "../../../output/lib/wxformbuilder"
@@ -38,5 +40,7 @@ project "layout-components-plugin"
wx_config { Debug="yes", Libs=libs }
configuration "Release"
buildoptions {"-fno-strict-aliasing"}
wx_config { Libs=libs }
configuration {"not vs*", "Release"}
buildoptions {"-fno-strict-aliasing"}

This file was deleted.

Oops, something went wrong.
View
@@ -1,80 +1,70 @@
-----------------------------------------------------------------------------
-- Name: solution.lua
-- Purpose: Generic Premake 4 solution defining common configurations
-- for all projects it contains.
-- Author: Andrea Zanellato
-- Modified by:
-- Created: 19/10/2011
-- Copyright: (c) 2011 wxFormBuilder Team
-- Licence: GNU General Public License Version 2
-----------------------------------------------------------------------------
solution "wxFormBuilder-Solution"
language "C++"
configurations {"Debug", "Release"}
local scriptDir = os.getcwd()
dofile( scriptDir .. "/wxwidgets.lua" )
local wxver = string.gsub( wxVersion, '%.', '' )
location ( "../../build/" .. wxVersion .. "/" .. _ACTION )
BuildDir = solution().location
CustomPrefix = "wx_" .. wxTarget .. wxUnicodeSign
if wxVersion < "2.9" then
DebugSuffix = "d-" .. wxver
else
DebugSuffix = "-" .. wxver
end
os.chdir( BuildDir )
--if wxCompiler == "gcc" and os.is("windows") then
-- flags {"NoImportLib"}
--end
if wxUseUnicode then
flags {"Unicode"}
defines {"UNICODE", "_UNICODE"}
end
configuration "windows"
defines {"WIN32", "_WINDOWS"}
configuration "macosx"
-- adding symbols so that premake does not include the "Wl,x"
-- flags, as these flags make clang linking fail
-- see http://industriousone.com/topic/how-remove-flags-ldflags
flags { "Symbols" }
buildoptions { "-Wno-overloaded-virtual" }
configuration "Debug"
defines {"DEBUG", "_DEBUG"}
flags {"Symbols"}
if wxCompiler == "gcc" then
buildoptions {"-O0"}
end
configuration "Release"
-----------------------------------------------------------------------------
-- Name: solution.lua
-- Purpose: Generic Premake 4 solution defining common configurations
-- for all projects it contains.
-- Author: Andrea Zanellato
-- Modified by:
-- Created: 19/10/2011
-- Copyright: (c) 2011 wxFormBuilder Team
-- Licence: GNU General Public License Version 2
-----------------------------------------------------------------------------
solution "wxFormBuilder-Solution"
language "C++"
configurations {"Debug", "Release"}
local scriptDir = os.getcwd()
dofile( scriptDir .. "/wxwidgets.lua" )
local wxver = string.gsub( wxVersion, '%.', '' )
location ( "../../build/" .. wxVersion .. "/" .. _ACTION )
BuildDir = solution().location
CustomPrefix = "wx_" .. wxTarget .. wxUnicodeSign
DebugSuffix = "-" .. wxver
os.chdir( BuildDir )
--if wxCompiler == "gcc" and os.is("windows") then
-- flags {"NoImportLib"}
--end
if wxUseUnicode then
flags {"Unicode"}
defines {"UNICODE", "_UNICODE"}
end
configuration "windows"
defines {"WIN32", "_WINDOWS"}
configuration "macosx"
-- adding symbols so that premake does not include the "Wl,x"
-- flags, as these flags make clang linking fail
-- see http://industriousone.com/topic/how-remove-flags-ldflags
flags { "Symbols" }
buildoptions { "-Wno-overloaded-virtual" }
configuration "Debug"
defines {"DEBUG", "_DEBUG"}
flags {"Symbols"}
if wxCompiler == "gcc" then
buildoptions {"-O0"}
end
configuration "Release"
-- if wxCompiler == "gcc" then
-- linkoptions {"-s"}
-- end
defines {"NDEBUG"}
-- flags {"OptimizeSpeed"}
dofile( scriptDir .. "/ticpp.lua" )
dofile( scriptDir .. "/plugin-interface.lua" )
if wxVersion < "2.9" then
dofile( scriptDir .. "/wxflatnotebook.lua" )
dofile( scriptDir .. "/wxpropgrid.lua" )
dofile( scriptDir .. "/wxscintilla.lua" )
dofile( scriptDir .. "/plugins/wxadditions-mini.lua" )
end
dofile( scriptDir .. "/plugins/additional.lua" )
dofile( scriptDir .. "/plugins/common.lua" )
dofile( scriptDir .. "/plugins/containers.lua" )
dofile( scriptDir .. "/plugins/forms.lua" )
dofile( scriptDir .. "/plugins/layout.lua" )
dofile( scriptDir .. "/wxformbuilder.lua" )
dofile( scriptDir .. "/utilities.lua" )
-- end
defines {"NDEBUG"}
-- flags {"OptimizeSpeed"}
dofile( scriptDir .. "/ticpp.lua" )
dofile( scriptDir .. "/plugin-interface.lua" )
dofile( scriptDir .. "/plugins/additional.lua" )
dofile( scriptDir .. "/plugins/common.lua" )
dofile( scriptDir .. "/plugins/containers.lua" )
dofile( scriptDir .. "/plugins/forms.lua" )
dofile( scriptDir .. "/plugins/layout.lua" )
dofile( scriptDir .. "/wxformbuilder.lua" )
dofile( scriptDir .. "/utilities.lua" )
View
@@ -14,12 +14,14 @@ project "TiCPP"
files {"../../sdk/tinyxml/*.cpp", "../../sdk/tinyxml/*.h"}
excludes {"xmltest.cpp"}
defines {"TIXML_USE_TICPP"}
buildoptions "-std=c++14"
if wxArchitecture then
buildoptions {"-arch " .. wxArchitecture}
end
configuration "not vs*"
buildoptions "-std=c++14"
configuration "not windows"
buildoptions {"-fPIC"}
Oops, something went wrong.

0 comments on commit 413eba1

Please sign in to comment.