mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-03 06:44:56 -04:00
--Bug fixes
-Really fix locking of affine scale. --Code changes -Remove dependency projects from the solution. Move to a project design where they are built once via command line and stored in a /Deps folder. --Because of this, libpng is built as a static lib instead of a dll because that's what its command line makefile supports. --Remove libpng16.dll from Wix installer. -Remove all configs except for debug and release. -Remove all platforms except for x64. -Add #define __TBB_NO_IMPLICIT_LINKAGE 1 to prevent tbb from locking for tbb_debug.lib by default on debug builds. -Put Ember.rc in a filter folder in the project. -Place pragma warning disable statements in PCH files rather than in projects. This makes it easier when using Qt Creator. -Move all resource files to the MSVC folder. -Set all targets in QtCreator project to their lowercase names to be more *nix friendly. Set -l link statements to use these new lowercase names for ember and embercl. -Rework projects to favor shadow builds. -Remove the symlinks.sh file and all references to it. It was never needed. Instead, just specify multiple include and link paths in the .pro files. -Change WIN32 to _WIN32. -Fix a few code warnings.
This commit is contained in:
54
makedeps.bat
Normal file
54
makedeps.bat
Normal file
@ -0,0 +1,54 @@
|
||||
REM Make final output folder
|
||||
mkdir Deps
|
||||
|
||||
REM Move to parent of deps folders
|
||||
cd ..
|
||||
git clone https://github.com/madler/zlib.git
|
||||
git clone https://github.com/glennrp/libpng.git
|
||||
git clone https://github.com/GNOME/libxml2.git
|
||||
git clone https://github.com/g-truc/glm.git
|
||||
|
||||
REM Set VC paths
|
||||
set INCLUDE=%INCLUDE%;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include;
|
||||
|
||||
REM libjpeg
|
||||
cd libjpeg
|
||||
nmake /f makefile.vc setup-v10
|
||||
nmake nodebug=1 /f makefile.vc all
|
||||
copy libjpeg.lib ..\fractorium\Deps
|
||||
cd ..
|
||||
|
||||
REM zlib
|
||||
cd zlib
|
||||
nmake -f win32/Makefile.msc all
|
||||
copy zlib.lib ..\fractorium\Deps
|
||||
cd ..
|
||||
|
||||
REM libxml2
|
||||
cd libxml2\win32
|
||||
cscript configure.js compiler=msvc iconv=no zlib=yes include=..\..\zlib lib=..\..\fractorium\Deps
|
||||
nmake /f Makefile.msvc all
|
||||
cd bin.msvc
|
||||
copy libxml2.dll ..\..\..\fractorium\Deps
|
||||
copy libxml2.lib ..\..\..\fractorium\Deps
|
||||
cd ..\..\..
|
||||
|
||||
REM libpng
|
||||
cd libpng
|
||||
mkdir zlib
|
||||
copy ..\zlib\zlib.lib zlib
|
||||
copy ..\zlib\zlib.h zlib
|
||||
copy ..\zlib\zconf.h zlib
|
||||
nmake -f scripts\makefile.vcwin32 all
|
||||
copy libpng.lib ..\fractorium\Deps
|
||||
cd ..
|
||||
|
||||
REM tbb
|
||||
cd tbb\build\vs2010
|
||||
devenv.exe tbb.vcxproj /upgrade
|
||||
msbuild tbb.vcxproj /p:Configuration=Release
|
||||
copy X64\Release\tbb.dll ..\..\..\fractorium\Deps
|
||||
copy X64\Release\tbb.lib ..\..\..\fractorium\Deps
|
||||
cd ..\..\..
|
||||
|
||||
cd fractorium
|
Reference in New Issue
Block a user