Skip to content
Permalink
Browse files

Whitespace corrections

Replace TAB with SPACE and adjust indentation, no functional changes.
  • Loading branch information
sodevel committed Dec 19, 2019
1 parent fe0a5da commit acf544404fe3a85443e781ac9e52462cddd730d9
Showing with 120 additions and 120 deletions.
  1. +80 −80 build/premake/wxwidgets.lua
  2. +20 −20 create_build_files4.sh
  3. +20 −20 create_build_files5.sh
@@ -65,12 +65,12 @@ if _OPTIONS["disable-mediactrl"] then wxUseMediaCtrl = false end
if _OPTIONS["disable-monolithic"] then wxMonolithic = false end

if wxCompiler == "mingw64" then
if not ( "x86_64" == wxArchitecture ) then
buildoptions( "-m32" )
linkoptions( "-m32" )
resoptions( "-F pe-i386" )
end
wxCompiler = "gcc"
if not ( "x86_64" == wxArchitecture ) then
buildoptions( "-m32" )
linkoptions( "-m32" )
resoptions( "-F pe-i386" )
end
wxCompiler = "gcc"
end

if os.is("windows") then
@@ -125,23 +125,23 @@ function wx_config(options)
end

-- Use wx-config
local useWXConfig = "no"
local useWXConfig = "no"
if _OPTIONS["force-wx-config"] then
useWXConfig = "yes"
end

wx_config_Private( options.Root or "",
options.Debug or "",
options.Host or "",
options.Version or wxVersion,
options.Static or useStatic,
options.Unicode or useUnicode,
options.Universal or "",
options.Libs or "",
options.WindowsCompiler or wxCompiler,
options.CompilerVersion or wxCompilerVersion,
options.WithoutLibs or "no",
options.UseWXConfig or useWXConfig
wx_config_Private(options.Root or "",
options.Debug or "",
options.Host or "",
options.Version or wxVersion,
options.Static or useStatic,
options.Unicode or useUnicode,
options.Universal or "",
options.Libs or "",
options.WindowsCompiler or wxCompiler,
options.CompilerVersion or wxCompilerVersion,
options.WithoutLibs or "no",
options.UseWXConfig or useWXConfig
)
end

@@ -198,39 +198,39 @@ function wx_config_Private(wxRoot, wxDebug, wxHost, wxVersion, wxStatic, wxUnico
path.join(wxRoot, "include")
}

if wxWithoutLibs == "no" then
-- common library path
libdirs { wxLibPath }

-- add the libs
libVersion = string.gsub(wxVersion, '%.', '') -- remove dot from version
if wxMonolithic then
links { "wxmsw"..libVersion..wxBuildType }
else
links { "wxbase"..libVersion..wxBuildType } -- base lib
local libs = "net,xml,adv,core,html,gl,aui,propgrid,ribbon,richtext,stc,webview,xrc"
if wxUseMediaCtrl then libs = libs .. ",media" end
for i, lib in ipairs(string.explode(libs, ",")) do
local libPrefix = 'wxmsw'
if lib == "xml" or lib == "net" or lib == "odbc" then
libPrefix = 'wxbase'
end
links { libPrefix..libVersion..wxBuildType..'_'..lib}
end
-- link with support libraries
for i, lib in ipairs({"wxjpeg", "wxpng", "wxzlib", "wxtiff", "wxexpat"}) do
links { lib..wxDebugSuffix }
end
links { "wxregex" .. wxBuildType }
end

if string.match(_ACTION, "vs(.*)$") then
-- link with MSVC support libraries
for i, lib in ipairs({"comctl32", "rpcrt4", "winmm", "advapi32", "wsock32", "Dbghelp"}) do
links { lib }
end
end
end
if wxWithoutLibs == "no" then
-- common library path
libdirs { wxLibPath }

-- add the libs
libVersion = string.gsub(wxVersion, '%.', '') -- remove dot from version
if wxMonolithic then
links { "wxmsw"..libVersion..wxBuildType }
else
links { "wxbase"..libVersion..wxBuildType } -- base lib
local libs = "net,xml,adv,core,html,gl,aui,propgrid,ribbon,richtext,stc,webview,xrc"
if wxUseMediaCtrl then libs = libs .. ",media" end
for i, lib in ipairs(string.explode(libs, ",")) do
local libPrefix = 'wxmsw'
if lib == "xml" or lib == "net" or lib == "odbc" then
libPrefix = 'wxbase'
end
links { libPrefix..libVersion..wxBuildType..'_'..lib}
end
-- link with support libraries
for i, lib in ipairs({"wxjpeg", "wxpng", "wxzlib", "wxtiff", "wxexpat"}) do
links { lib..wxDebugSuffix }
end
links { "wxregex" .. wxBuildType }
end

if string.match(_ACTION, "vs(.*)$") then
-- link with MSVC support libraries
for i, lib in ipairs({"comctl32", "rpcrt4", "winmm", "advapi32", "wsock32", "Dbghelp"}) do
links { lib }
end
end
end
end

-- use wx-config to figure out build parameters
@@ -251,29 +251,29 @@ function wx_config_Private(wxRoot, wxDebug, wxHost, wxVersion, wxStatic, wxUnico
if wxHost ~= "" then configCmd = configCmd .. " --host=" .. wxHost end
-- if wxVersion ~= "" then configCmd = configCmd .. " --version=" .. wxVersion end

if _ACTION == "codelite" then
-- set the parameters to the current configuration
buildoptions {"$(shell " .. configCmd .." --cxxflags)"}

if wxWithoutLibs == "no" then
linkoptions {"$(shell " .. configCmd .." --libs " .. wxLibs .. ")"}
end

if os.get() == "windows" then
resoptions {"$(shell " .. configCmd .." --rcflags)"}
end
else
-- set the parameters to the current configuration
buildoptions {"`" .. configCmd .." --cxxflags`"}

if wxWithoutLibs == "no" then
linkoptions {"`" .. configCmd .." --libs " .. wxLibs .. "`"}
end

if os.get() == "windows" then
resoptions {"`" .. configCmd .." --rcflags || " .. configCmd .." --rescomp | cut -d' ' -f2-`"}
end
end
if _ACTION == "codelite" then
-- set the parameters to the current configuration
buildoptions {"$(shell " .. configCmd .." --cxxflags)"}

if wxWithoutLibs == "no" then
linkoptions {"$(shell " .. configCmd .." --libs " .. wxLibs .. ")"}
end

if os.get() == "windows" then
resoptions {"$(shell " .. configCmd .." --rcflags)"}
end
else
-- set the parameters to the current configuration
buildoptions {"`" .. configCmd .." --cxxflags`"}

if wxWithoutLibs == "no" then
linkoptions {"`" .. configCmd .." --libs " .. wxLibs .. "`"}
end

if os.get() == "windows" then
resoptions {"`" .. configCmd .." --rcflags || " .. configCmd .." --rescomp | cut -d' ' -f2-`"}
end
end
end

-- BUG: here, using any configuration() function will reset the current filter
@@ -303,10 +303,10 @@ function wx_config_Private(wxRoot, wxDebug, wxHost, wxVersion, wxStatic, wxUnico
--~ wxCompiler = _OPTIONS.cc
--~ print("seen option '--cc=" .. _OPTIONS["cc"] .. "' overriding default cc='vc'")
--~ end
if wxUseWXConfig == "no" then
wx_config_for_windows(wxCompiler, wxCompilerVersion)
else
wx_config_for_posix()
end
if wxUseWXConfig == "no" then
wx_config_for_windows(wxCompiler, wxCompilerVersion)
else
wx_config_for_posix()
end
end
end
@@ -12,35 +12,35 @@ wxpath=`wx-config --prefix`
for args in "$@"
do
haveroot=`expr "${args}" : '--wx-root=.*'`
havearch=`expr "${args}" : '--architecture=.*'`
haverpath=`expr "${args}" : '--rpath=.*'`
havearch=`expr "${args}" : '--architecture=.*'`
haverpath=`expr "${args}" : '--rpath=.*'`
if ( [ ${args} = "--help" ] || [ ${args} = "-h" ] ); then
echo "Available options:"
echo
echo "--disable-mediactrl Disable wxMediaCtrl / wxMedia library."
echo
echo "--disable-shared Use static wxWidgets build instead of shared libraries."
echo
echo "--wx-root Specify the wxWidgets build path,"
echo " useful for wxWidgets builds not installed"
echo " in your system (alternate/custom builds)"
echo " Example: --wx-root=/home/devel/wx/3.0/buildgtk"
echo " Current: $wxpath"
echo
echo "--architecture Specify build architecture (e.g. --architecture=i386)."
echo "--rpath Specify a rpath (e.g. --rpath=/usr/lib/wxformbuilder)."
echo
exit
echo "Available options:"
echo
echo "--disable-mediactrl Disable wxMediaCtrl / wxMedia library."
echo
echo "--disable-shared Use static wxWidgets build instead of shared libraries."
echo
echo "--wx-root Specify the wxWidgets build path,"
echo " useful for wxWidgets builds not installed"
echo " in your system (alternate/custom builds)"
echo " Example: --wx-root=/home/devel/wx/3.0/buildgtk"
echo " Current: $wxpath"
echo
echo "--architecture Specify build architecture (e.g. --architecture=i386)."
echo "--rpath Specify a rpath (e.g. --rpath=/usr/lib/wxformbuilder)."
echo
exit
elif [ ${args} = "--disable-mediactrl" ]; then
mediactrl="--disable-mediactrl"
continue
elif [ ${args} = "--disable-shared" ]; then
elif [ ${args} = "--disable-shared" ]; then
shared="--disable-shared"
continue
elif ( [ "$haveroot" -gt "0" ] ); then
wxroot=${args}
continue
elif ( [ "$havearch" -gt "0" ] ); then
elif ( [ "$havearch" -gt "0" ] ); then
arch=${args}
continue
elif ( [ "$haverpath" -gt "0" ] ); then
@@ -12,35 +12,35 @@ wxpath=`wx-config --prefix`
for args in "$@"
do
haveroot=`expr "${args}" : '--wx-root=.*'`
havearch=`expr "${args}" : '--architecture=.*'`
haverpath=`expr "${args}" : '--rpath=.*'`
havearch=`expr "${args}" : '--architecture=.*'`
haverpath=`expr "${args}" : '--rpath=.*'`
if ( [ ${args} = "--help" ] || [ ${args} = "-h" ] ); then
echo "Available options:"
echo
echo "--disable-mediactrl Disable wxMediaCtrl / wxMedia library."
echo
echo "--disable-shared Use static wxWidgets build instead of shared libraries."
echo
echo "--wx-root Specify the wxWidgets build path,"
echo " useful for wxWidgets builds not installed"
echo " in your system (alternate/custom builds)"
echo " Example: --wx-root=/home/devel/wx/3.0/buildgtk"
echo " Current: $wxpath"
echo
echo "--architecture Specify build architecture (e.g. --architecture=i386)."
echo "--rpath Specify a rpath (e.g. --rpath=/usr/lib/wxformbuilder)."
echo
exit
echo "Available options:"
echo
echo "--disable-mediactrl Disable wxMediaCtrl / wxMedia library."
echo
echo "--disable-shared Use static wxWidgets build instead of shared libraries."
echo
echo "--wx-root Specify the wxWidgets build path,"
echo " useful for wxWidgets builds not installed"
echo " in your system (alternate/custom builds)"
echo " Example: --wx-root=/home/devel/wx/3.0/buildgtk"
echo " Current: $wxpath"
echo
echo "--architecture Specify build architecture (e.g. --architecture=i386)."
echo "--rpath Specify a rpath (e.g. --rpath=/usr/lib/wxformbuilder)."
echo
exit
elif [ ${args} = "--disable-mediactrl" ]; then
mediactrl="--disable-mediactrl"
continue
elif [ ${args} = "--disable-shared" ]; then
elif [ ${args} = "--disable-shared" ]; then
shared="--disable-shared"
continue
elif ( [ "$haveroot" -gt "0" ] ); then
wxroot=${args}
continue
elif ( [ "$havearch" -gt "0" ] ); then
elif ( [ "$havearch" -gt "0" ] ); then
arch=${args}
continue
elif ( [ "$haverpath" -gt "0" ] ); then

0 comments on commit acf5444

Please sign in to comment.
You can’t perform that action at this time.