From 6f3316036834ebe91e3f4be093b72186518d11bd Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Wed, 15 Jul 2015 19:38:35 +1000 Subject: [PATCH] Add the User Additions module to the QB64 compiler build at setup time. --- .../download/opus-tools-0.1.9/ltmain.sh | 0 .../audio/decode/mp3_mini/os/lnx/build.sh | 0 .../input/game_controller/os/lnx/build.sh | 0 internal/c/parts/user_mods/os/lnx/build.sh | 0 .../c/parts/user_mods/os/lnx/setup_build.sh | 4 ++++ .../parts/user_mods/os/osx/setup_build.command | 5 +++++ .../c/parts/user_mods/os/win/setup_build.bat | 3 +++ setup_lnx.sh | 8 +++++++- setup_osx.command | 11 +++++++++++ setup_win.bat | 18 +++++++++++++++--- 10 files changed, 45 insertions(+), 4 deletions(-) mode change 100644 => 100755 internal/c/parts/audio/conversion/download/opus-tools-0.1.9/ltmain.sh mode change 100644 => 100755 internal/c/parts/audio/decode/mp3_mini/os/lnx/build.sh mode change 100644 => 100755 internal/c/parts/input/game_controller/os/lnx/build.sh mode change 100644 => 100755 internal/c/parts/user_mods/os/lnx/build.sh create mode 100755 internal/c/parts/user_mods/os/lnx/setup_build.sh create mode 100644 internal/c/parts/user_mods/os/osx/setup_build.command create mode 100644 internal/c/parts/user_mods/os/win/setup_build.bat diff --git a/internal/c/parts/audio/conversion/download/opus-tools-0.1.9/ltmain.sh b/internal/c/parts/audio/conversion/download/opus-tools-0.1.9/ltmain.sh old mode 100644 new mode 100755 diff --git a/internal/c/parts/audio/decode/mp3_mini/os/lnx/build.sh b/internal/c/parts/audio/decode/mp3_mini/os/lnx/build.sh old mode 100644 new mode 100755 diff --git a/internal/c/parts/input/game_controller/os/lnx/build.sh b/internal/c/parts/input/game_controller/os/lnx/build.sh old mode 100644 new mode 100755 diff --git a/internal/c/parts/user_mods/os/lnx/build.sh b/internal/c/parts/user_mods/os/lnx/build.sh old mode 100644 new mode 100755 diff --git a/internal/c/parts/user_mods/os/lnx/setup_build.sh b/internal/c/parts/user_mods/os/lnx/setup_build.sh new file mode 100755 index 000000000..f6f69ee79 --- /dev/null +++ b/internal/c/parts/user_mods/os/lnx/setup_build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +gcc -I../../../../ -DFREEGLUT_STATIC -I../../include -c ../../src/luke_mods.cpp -o temp/luke_mods.o +gcc -I../../../../ -DFREEGLUT_STATIC -I../../include -c ../../src/steve_mods.cpp -o temp/steve_mods.o +ar rcs src.a temp/steve_mods.o temp/luke_mods.o diff --git a/internal/c/parts/user_mods/os/osx/setup_build.command b/internal/c/parts/user_mods/os/osx/setup_build.command new file mode 100644 index 000000000..02970bac4 --- /dev/null +++ b/internal/c/parts/user_mods/os/osx/setup_build.command @@ -0,0 +1,5 @@ +cd "$(dirname "$0")" + +gcc -I../../../../ -I../../include -c ../../src/luke_mods.cpp -o temp/luke_mods.o +gcc -I../../../../ -I../../include -c ../../src/steve_mods.cpp -o temp/steve_mods.o +ar rcs src.a temp/steve_mods.o temp/luke_mods.o diff --git a/internal/c/parts/user_mods/os/win/setup_build.bat b/internal/c/parts/user_mods/os/win/setup_build.bat new file mode 100644 index 000000000..1143bec7e --- /dev/null +++ b/internal/c/parts/user_mods/os/win/setup_build.bat @@ -0,0 +1,3 @@ +..\..\..\..\c_compiler\bin\gcc -DFREEGLUT_STATIC -I..\..\..\..\ -I..\..\include -c ..\..\src\luke_mods.cpp -o temp\luke_mods.o +..\..\..\..\c_compiler\bin\gcc -DFREEGLUT_STATIC -I..\..\..\..\ -I..\..\include -c ..\..\src\steve_mods.cpp -o temp\steve_mods.o +..\..\..\..\c_compiler\bin\ar rcs src.a temp\steve_mods.o temp\luke_mods.o diff --git a/setup_lnx.sh b/setup_lnx.sh index d0dfd3d18..c7e504a9c 100755 --- a/setup_lnx.sh +++ b/setup_lnx.sh @@ -183,6 +183,12 @@ else ./setup_build.sh cd ../../../../../../../.. + echo "Building User Additions" + cd internal/c/parts/user_mods/os/lnx + rm -f src.a + ./setup_build.sh + cd ../../../../../.. + echo "Building library 'Core:FreeGLUT'" cd internal/c/parts/core/os/lnx rm -f src.a @@ -192,7 +198,7 @@ else echo "Building 'QB64'" cp -r ./internal/source/* ./internal/temp/ cd internal/c - g++ -w qbx.cpp libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o ../../qb64 + g++ -w qbx.cpp parts/user_mods/os/lnx/src.a libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -DDEPENDENCY_USER_MODS -o ../../qb64 cd ../.. fi diff --git a/setup_osx.command b/setup_osx.command index f7b38d763..00f14157f 100644 --- a/setup_osx.command +++ b/setup_osx.command @@ -44,6 +44,17 @@ if [ ! -f ./src.o ]; then fi cd ../../../../../../../.. +echo "Building User Additions" +cd internal/c/parts/user_mods/os/lnx +rm -f src.a +./setup_build.sh +if [ ! -f ./src.a ]; then + echo "Compilation of ./internal/c/parts/user_mods/os/osx/src.a failed!" + Pause + exit 1 +fi +cd ../../../../../.. + echo "Building 'QB64' (~3 min)" cp ./internal/source/* ./internal/temp/ cd internal/c diff --git a/setup_win.bat b/setup_win.bat index 3a7964150..8f123f458 100644 --- a/setup_win.bat +++ b/setup_win.bat @@ -27,17 +27,29 @@ if exist src.o del src.o call setup_build.bat cd ../../../../../../../.. +echo Building User Additions +cd internal/c/parts/user_mods/os/win +if exist src.a del src.a +call setup_build.bat +cd ../../../../../.. + echo Building library 'Core:FreeGLUT' cd internal/c/parts/core/os/win if exist src.a del src.a call setup_build.bat cd ../../../../../.. +cd internal\c\parts\user_mods\os\win +..\..\..\..\c_compiler\bin\gcc -DFREEGLUT_STATIC -I..\..\..\..\ -I..\..\include -c ..\..\src\luke_mods.cpp -o temp\luke_mods.o +..\..\..\..\c_compiler\bin\gcc -DFREEGLUT_STATIC -I..\..\..\..\ -I..\..\include -c ..\..\src\steve_mods.cpp -o temp\steve_mods.o +..\..\..\..\c_compiler\bin\ar rcs src.a temp\steve_mods.o temp\luke_mods.o +cd ..\..\..\..\..\.. + echo Building 'QB64' copy internal\source\*.* internal\temp\ >nul -cd internal/c -c_compiler\bin\g++ -mconsole -s -Wfatal-errors -w -Wall qbx.cpp libqb\os\win\libqb_setup.o -D DEPENDENCY_LOADFONT parts\video\font\ttf\os\win\src.o -lws2_32 -lwinspool parts\core\os\win\src.a -lopengl32 -lglu32 -lwinmm -lgdi32 -Wl,--subsystem,windows -static-libgcc -static-libstdc++ -D FREEGLUT_STATIC -lksguid -lole32 -lwinmm -ldxguid -o "..\..\qb64.exe" -cd ../.. +cd internal\c +c_compiler\bin\g++ -mconsole -s -Wfatal-errors -w -Wall qbx.cpp libqb\os\win\libqb_setup.o parts\user_mods\os\win\src.a -D DEPENDENCY_USER_MODS -D DEPENDENCY_LOADFONT parts\video\font\ttf\os\win\src.o -lws2_32 -lwinspool parts\core\os\win\src.a -lopengl32 -lglu32 -lwinmm -lgdi32 -Wl,--subsystem,windows -static-libgcc -static-libstdc++ -D FREEGLUT_STATIC -lksguid -lole32 -lwinmm -ldxguid -o "..\..\qb64.exe" +cd ..\.. echo. echo Launching 'QB64'