diff options
| author | Alexander Pickering <alex@cogarr.net> | 2018-08-31 21:23:00 -0400 |
|---|---|---|
| committer | Alexander Pickering <alex@cogarr.net> | 2018-08-31 21:23:00 -0400 |
| commit | fc3d1473f16d1d06f8ffd97cb192ba57e34380d7 (patch) | |
| tree | 851b196b988e34e41344e31fcca40dc5b65930e0 /Makefile | |
| parent | bc66e5c26672a93b4960532dacde9dadd0ab3bf3 (diff) | |
| download | brokengine-fc3d1473f16d1d06f8ffd97cb192ba57e34380d7.tar.gz brokengine-fc3d1473f16d1d06f8ffd97cb192ba57e34380d7.tar.bz2 brokengine-fc3d1473f16d1d06f8ffd97cb192ba57e34380d7.zip | |
Added file open dialog
Added a file open dialog to the gui library
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -150,7 +150,7 @@ SHARED_CLIENT_FILES = lua_api/common phys/physcommon lua_api/phys/bphysbox util/ SHARED_CLIENT_OBJS = $(SHARED_CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o) # The client-side only stuff -LAPI_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiwindow iguieditbox iguicolorselector +LAPI_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiwindow iguieditbox iguicolorselector iguifiledialog LAPI_PHYS = bphysmodel cbphysbox LAPI_SCENE = icamera igeneric ilight imesh LAPI_VIDEO = iimage itexture smaterial @@ -309,12 +309,16 @@ $(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt $(LNNGDIR)/libnng.dll.a : $(LNNGDIR)/Makefile cd $(LNNGDIR)/dyn_lib && $(MAKE) nng +TEST_BIN_NAMES=brokengine_client.exe Irrlicht.dll libnanomsg.dll libnng.dll lua51.dll +TEST_BINS=$(TEST_BIN_NAMES:%=test/bin/%) + #compile & run tests -test: $(TEST_PATH)test_stream $(TEST_PATH)test_phys - @$(ECHO) "Testing stream : " - @./$(TEST_PATH)test_stream - @$(ECHO) "Testing physics: " - @./$(TEST_PATH)test_phys +test: $(TEST_BINS) + @$(ECHO) "Running busted tests" + @./busted busted.spec + +$(TEST_BINS) : test/bin/% : bin/client/bin/% + cp $^ $@ $(TEST_PATH)test_stream : $(TEST_SRC)test_streams.cpp $(SHARED_SRC)/lua_api/stream.cpp $(SHARED_SRC)/lua_api/stream.hpp @$(CC) $(CFLAGS) -o $(TEST_PATH)test_stream $(TEST_SRC)test_streams.cpp $(SHARED_SRC)/lua_api/stream.cpp $(SHARED_SRC)/lua_api/stream.hpp |