From 9a33a0f978336b210700334a487522e342feb84c Mon Sep 17 00:00:00 2001
From: emb <>
Date: Fri, 6 Mar 2015 06:45:21 -0600
Subject: [PATCH] Updated build instructions

---
 Build Instructions.txt | 75 +++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 30 deletions(-)

diff --git a/Build Instructions.txt b/Build Instructions.txt
index c2e0020..27fc60a 100644
--- a/Build Instructions.txt	
+++ b/Build Instructions.txt	
@@ -1,48 +1,63 @@
 Linux Setup
 ===============================
 Install ubuntu or xubuntu 14.04
-Run the following command to install necessary dependencies
+0. Run the following command to install necessary dependencies
 	sudo apt-get install git g++ cmake dos2unix zlib1g-dev libsdl2-2.0 libsdl2-mixer-2.0 libsdl2-image-2.0 libsdl2-ttf-2.0 \
                 libsdl2-dev libsdl2-mixer-dev libsdl2-image-dev libsdl2-ttf-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
                 libgstreamer-plugins-good1.0-dev zlib1g-dev libglib2.0-0 libglib2.0-dev sqlite3
 
-To build, run the following command:
+1. Generate your gcc make files with running the following command from inside the root folder of your setup:
 
-./Build.sh
+  cmake RetroFE/Source -BRetroFE/Build -DGSTREAMER_ROOT=D:/gstreamer/1.0/x86 -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0
 
-Files will output to Artifacts/RetroFE. Copy this directory to any folder of your choosing (i.e.)
+2. Compile RetroFE and create a full environment by running the following commands: 
 
-cp -r Artifacts/RetroFE /opt
+  cmake --build RetroFE/Build
+  python Scripts/Package.py --os=windows --build=full --gstreamer_path=D:/gstreamer/1.0/x86
 
+3. Copy your live RetroFE system to any folder of your choosing. files can be found in Artifacts\windows\RetroFE
 
 Windows Setup
 ===============================
-Install Python 2.7
-Install sphinx with python
-Install visual studio 2012
-Install Microsoft Windows SDK for Windows 7 and .net Framework 4 http://www.microsoft.com/en-us/download/details.aspx?id=8279
-Install cmake
-Install tortoisehg
-Install 7zip
-Install gstreamer and gstreamer-devel (x86, not 64 bit!) from http://gstreamer.freedesktop/org/data/pkg/windows/1.4.0
+0. Setup libraries
+  Install Python 2.7
+  Install sphinx with python
+  Install visual studio 2012
+  Install Microsoft Windows SDK for Windows 7 and .net Framework 4 http://www.microsoft.com/en-us/download/details.aspx?id=8279
+  Install cmake
+  Install tortoisehg
+  Install 7zip
+  Install gstreamer and gstreamer-devel to c:/gstreamer(x86, not 64 bit!) from http://gstreamer.freedesktop/org/data/pkg/windows/1.4.0
 
-To build:
-1. Run "RetroFE/Source/SetupEnvironment.bat" to setup necessary variables and paths to compile in visual studio
-2. Generate your visual studio solution files with running:
-   cd RetroFE
-   cmake Source -BBuild -DGSTREAMER_ROOT=c:/gstreamer/1.0/x86 -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0
-3. Compile your environment:
-   cd Build
-   msbuild RetroFE.sln
 
-To package:
-Create a Artifacts/RetroFE folder
-Copy Package/Environment/Common/* to Artifacts/RetroFE
-Copy Package/Environment/Windows/* to Artifacts/RetroFE
-Find all libaries to include, copy them to Artifacts/RetroFE/Core
-Copy Build/Debug/RetroFE.exe to Artifacts/RetroFE/Core
+1. Setup Environment
+ 
+   Run "RetroFE/Source/SetupEnvironment.bat" to setup necessary variables and paths to compile in visual studio
 
-Build Configuration/Configuration.sln
-copy Configuration.exe to Artifacts/RetroFE
+2. Generate your visual studio solution files with running the following command from inside the root folder of your setup:
 
-Build documentation and copy to Artifacts/RetroFE/Documentation
+  cmake RetroFE/Source -BRetroFE/Build -DGSTREAMER_ROOT=C:/gstreamer/1.0/x86 -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0
+  
+3. Compile RetroFE and create a full environment by running the following commands: 
+
+  cmake --build RetroFE/Build --config Release
+  python Scripts\Package.py --os=windows --build=full --gstreamer_path=D:/gstreamer/1.0/x86
+
+4. Copy your live RetroFE system to any folder of your choosing. files can be found in Artifacts\windows\RetroFE
+
+
+Other build options
+===============================
+After compiling your code you can also build different environments:
+
+1. To copy just the layouts to Artifacts/windows/RetroFE, run 
+  python Scripts\Package.py --os=windows --build=layout --gstreamer_path=D:/gstreamer/1.0/x86
+
+2. To copy just retrofe.exe to Artifacts/windows/RetroFE, run 
+  python Scripts\Package.py --os=windows --build=engine --gstreamer_path=D:/gstreamer/1.0/x86
+
+3. To copy just the third party dlls and retrofe to Artifacts/windows/RetroFE, run 
+  python Scripts\Package.py --os=windows --build=core --gstreamer_path=D:/gstreamer/1.0/x86
+
+4. To copy a whole live installation Artifacts/windows/RetroFE, run 
+  python Scripts\Package.py --os=windows --build=full --gstreamer_path=D:/gstreamer/1.0/x86