Browse Source

Got it building with dependencies

* SFML needs to be in a version branch. I chose 2.5.1
* Added build script for release only
* Added imgui-sfml schenanigans
master
Macoy Madson 1 year ago
parent
commit
c5d2aa7c45
4 changed files with 42 additions and 15 deletions
  1. +20
    -0
      BuildDependencies_Release.sh
  2. +10
    -7
      Jamfile
  3. +11
    -7
      Jamrules
  4. +1
    -1
      dependencies/SFML

+ 20
- 0
BuildDependencies_Release.sh View File

@ -0,0 +1,20 @@
#!/bin/sh
# SFML
echo "Building SFML..."
echo "WARNING: This will run git clean -f on SFML"
cd dependencies/SFML
make clean
git clean -f
cmake .
make -j4
cd ../../
# Imgui-sfml
# I shouldn't need to do this, but I was having trouble getting IMGUI_USER_CONFIG to work
# Instead of using the define, append the file in
echo "Copying imgui-sfml config to imgui imconfig..."
cd dependencies/imgui
git checkout HEAD -- imconfig.h
cat ../imgui-sfml/imconfig-SFML.h >> imconfig.h

+ 10
- 7
Jamfile View File

@ -45,8 +45,16 @@ Library libBase20 : dataStructures/pool.cpp
sound/sound.cpp
tileMap/tileEditor.cpp
tileMap/tileEditor.cpp
tileMap/multilayerMapEditor.cpp ;
tileMap/multilayerMapEditor.cpp
# IMGUI
dependencies/imgui/imgui.cpp
dependencies/imgui/imgui_demo.cpp
dependencies/imgui/imgui_widgets.cpp
dependencies/imgui/imgui_draw.cpp
dependencies/imgui-sfml/imgui-SFML.cpp
;
#Library libTiledImporter : tiledImporter/tiledImporter.cpp
# tiledImporter/tiledImporter.cpp
# tiledImporter/pugixml/pugixml.cpp
@ -60,11 +68,6 @@ MakeLocate Base20Pseudotarget : bin ;
# Tests
#
Main TestBase20 : tests/main.cpp
../../3rdParty/repositories/imgui/imgui.cpp
../../3rdParty/repositories/imgui/imgui_demo.cpp
../../3rdParty/repositories/imgui/imgui_widgets.cpp
../../3rdParty/repositories/imgui/imgui_draw.cpp
../../3rdParty/repositories/imgui-sfml/imgui-SFML.cpp
;
LinkLibraries TestBase20 : libBase20 ;

+ 11
- 7
Jamrules View File

@ -44,7 +44,11 @@ LINK = clang++ ;
# lstdc++ = standard library [Unused]
# Arguments used on all projects, regardless of any variables
C++FLAGS = -std=c++11 -Wall -Wextra -Wno-unused-parameter -D IMGUI_INCLUDE_IMCONFIG_H ;
# C++FLAGS = -std=c++11 -Wall -Wextra -Wno-unused-parameter -D IMGUI_INCLUDE_IMCONFIG_H ;
C++FLAGS = -std=c++11 -Wall -Wextra -Wno-unused-parameter
# Why isn't this quoting properly?
# -D IMGUI_USER_CONFIG=\"dependencies/imgui-sfml/imconfig-SFML.h\"
;
# Required arguments for tests
TESTSC++FLAGS = -g ;
@ -53,19 +57,19 @@ ALLLIBSC++FLAGS = $(TESTSC++FLAGS) ;
OPTIM = -O0 ;
HDRS =
../../3rdParty/repositories/SFML/include
../../3rdParty/repositories/imgui
../../3rdParty/repositories/imgui-sfml
dependencies/SFML/include
dependencies/imgui
dependencies/imgui-sfml
;
LINKFLAGS = --verbose
-Wl,-rpath,.:../../3rdParty/repositories/SFML/lib
LINKFLAGS =
-Wl,-rpath,.:dependencies/SFML/lib
;
# This is for test executables, not the lib. You can use this as reference for your own executables
LINKLIBS =
# SFML
-L../../3rdParty/repositories/SFML/lib
-Ldependencies/SFML/lib
-lsfml-audio -lsfml-graphics -lsfml-window -lsfml-system
# OpenGL


+ 1
- 1
dependencies/SFML

@ -1 +1 @@
Subproject commit 50e173e403ef8912e3d8ac3c7ab3e27e32243339
Subproject commit 2f11710abc5aa478503a7ff3f9e654bd2078ebab

Loading…
Cancel
Save