Executable

2022-01-25 15:22:03 +00:00 · 2022-01-25 15:22:03 +00:00 · a45862c454
parent 2c88a01cfd
commit a45862c454
284 changed files with 9 additions and 9 deletions
--- a/16
+++ b/16
@ -30,7 +30,7 @@ esrcs := $(shell find ./source/engine -name '*.c*')
 esrcs := $(filter-out %sqlite3.c %shell.c, $(esrcs))
 eheaders := $(shell find ./source/engine -name '*.h')
 edirs := $(addprefix $(ETP), Chipmunk2D/include bitmap-outliner cgltf enet/include pl_mpeg s7 sqlite3 stb) ./source/engine # $(shell find ./source/engine -type d)
-edirs := $(filter-out %docs %doc %include% %src %examples  , $(edirs))
+edirs := $(filter-out %docs %doc %include% %src %examples  , $(edirs)) /usr/include/directfb

 eobjects := $(sort $(patsubst .%.cpp, $(objprefix)%.o, $(filter %.cpp, $(esrcs))) $(patsubst .%.c, $(objprefix)%.o, $(filter %.c, $(esrcs))))

@ -71,10 +71,10 @@ COMPILER_FLAGS := -g -O0 $(WARNING_FLAGS)
 LIBPATH := $(addprefix -L, .)

 ifeq ($(UNAME), Windows_NT)
-	LINKER_FLAGS:= -static
-	# DYNAMIC LIBS: SDL2 opengl32
-	ELIBS := glew32 mingw32 SDL2main SDL2 m dinput8 dxguid dxerr8 user32 gdi32 winmm imm32 ole32 oleaut32 shell32 version uuid setupapi opengl32 stdc++ winpthread
-	CLIBS :=
+	LINKER_FLAGS:= -static -DSDL_MAIN_HANDLED
+	ELIBS := engine   mingw32 SDL2main SDL2 m dinput8 dxguid dxerr8 user32 gdi32 winmm imm32 ole32 oleaut32 shell32 version uuid setupapi opengl32 stdc++ winpthread
+	ELIBS := $(ELIBS) SDL2_mixer FLAC vorbis vorbisenc vorbisfile mpg123 out123 syn123 opus opusurl opusfile ogg ssp shlwapi
+	CLIBS := glew32
 	EXT := .exe
 else
 	LINKER_FLAGS :=
@ -101,8 +101,8 @@ libengine.a: $(eobjects)

 xbrainstorm: libengine.a $(bsobjects)
 	@echo Making brainstorm
-	$(CXX) $(bsobjects) -DGLEW_STATIC $(includeflag) $(LIBPATH) $(LINKER_FLAGS) $(LELIBS) -o $@
-	mv xbrainstorm brainstorm/xbrainstorm
+	@$(CXX) $(bsobjects) -DGLEW_STATIC $(includeflag) $(LIBPATH) $(LINKER_FLAGS) $(LELIBS) -o $@
+	mv xbrainstorm brainstorm/brainstorm$(EXT)

 $(objprefix)/%.o:%.cpp
 	@mkdir -p $(@D)
@ -116,5 +116,5 @@ $(objprefix)/%.o:%.c

 clean:
 	@echo Cleaning project
-	@rm -f $(eobjects)
+	@rm -f $(eobjects) $(bsobjects)

--- a/source/editor/debug.c
+++ b/source/editor/debug.c
--- a/source/editor/debug.h
+++ b/source/editor/debug.h
--- a/source/editor/editor.cpp
+++ b/source/editor/editor.cpp
--- a/source/editor/editor.h
+++ b/source/editor/editor.h
--- a/source/editor/editorstate.c
+++ b/source/editor/editorstate.c
--- a/source/editor/editorstate.h
+++ b/source/editor/editorstate.h
--- a/source/editor/imgui/LICENSE.txt
+++ b/source/editor/imgui/LICENSE.txt
--- a/source/editor/imgui/backends/imgui_impl_allegro5.cpp
+++ b/source/editor/imgui/backends/imgui_impl_allegro5.cpp
--- a/source/editor/imgui/backends/imgui_impl_allegro5.h
+++ b/source/editor/imgui/backends/imgui_impl_allegro5.h
--- a/source/editor/imgui/backends/imgui_impl_android.cpp
+++ b/source/editor/imgui/backends/imgui_impl_android.cpp
--- a/source/editor/imgui/backends/imgui_impl_android.h
+++ b/source/editor/imgui/backends/imgui_impl_android.h
--- a/source/editor/imgui/backends/imgui_impl_dx10.cpp
+++ b/source/editor/imgui/backends/imgui_impl_dx10.cpp
--- a/source/editor/imgui/backends/imgui_impl_dx10.h
+++ b/source/editor/imgui/backends/imgui_impl_dx10.h
--- a/source/editor/imgui/backends/imgui_impl_dx11.cpp
+++ b/source/editor/imgui/backends/imgui_impl_dx11.cpp
--- a/source/editor/imgui/backends/imgui_impl_dx11.h
+++ b/source/editor/imgui/backends/imgui_impl_dx11.h
--- a/source/editor/imgui/backends/imgui_impl_dx12.cpp
+++ b/source/editor/imgui/backends/imgui_impl_dx12.cpp
--- a/source/editor/imgui/backends/imgui_impl_dx12.h
+++ b/source/editor/imgui/backends/imgui_impl_dx12.h
--- a/source/editor/imgui/backends/imgui_impl_dx9.cpp
+++ b/source/editor/imgui/backends/imgui_impl_dx9.cpp
--- a/source/editor/imgui/backends/imgui_impl_dx9.h
+++ b/source/editor/imgui/backends/imgui_impl_dx9.h
--- a/source/editor/imgui/backends/imgui_impl_glfw.cpp
+++ b/source/editor/imgui/backends/imgui_impl_glfw.cpp
--- a/source/editor/imgui/backends/imgui_impl_glfw.h
+++ b/source/editor/imgui/backends/imgui_impl_glfw.h
--- a/source/editor/imgui/backends/imgui_impl_glut.cpp
+++ b/source/editor/imgui/backends/imgui_impl_glut.cpp
--- a/source/editor/imgui/backends/imgui_impl_glut.h
+++ b/source/editor/imgui/backends/imgui_impl_glut.h
--- a/source/editor/imgui/backends/imgui_impl_marmalade.cpp
+++ b/source/editor/imgui/backends/imgui_impl_marmalade.cpp
--- a/source/editor/imgui/backends/imgui_impl_marmalade.h
+++ b/source/editor/imgui/backends/imgui_impl_marmalade.h
--- a/source/editor/imgui/backends/imgui_impl_metal.h
+++ b/source/editor/imgui/backends/imgui_impl_metal.h
--- a/source/editor/imgui/backends/imgui_impl_metal.mm
+++ b/source/editor/imgui/backends/imgui_impl_metal.mm
--- a/source/editor/imgui/backends/imgui_impl_opengl2.cpp
+++ b/source/editor/imgui/backends/imgui_impl_opengl2.cpp
--- a/source/editor/imgui/backends/imgui_impl_opengl2.h
+++ b/source/editor/imgui/backends/imgui_impl_opengl2.h
--- a/source/editor/imgui/backends/imgui_impl_opengl3.cpp
+++ b/source/editor/imgui/backends/imgui_impl_opengl3.cpp
--- a/source/editor/imgui/backends/imgui_impl_opengl3.h
+++ b/source/editor/imgui/backends/imgui_impl_opengl3.h
--- a/source/editor/imgui/backends/imgui_impl_opengl3_loader.h
+++ b/source/editor/imgui/backends/imgui_impl_opengl3_loader.h
--- a/source/editor/imgui/backends/imgui_impl_osx.h
+++ b/source/editor/imgui/backends/imgui_impl_osx.h
--- a/source/editor/imgui/backends/imgui_impl_osx.mm
+++ b/source/editor/imgui/backends/imgui_impl_osx.mm
--- a/source/editor/imgui/backends/imgui_impl_sdl.cpp
+++ b/source/editor/imgui/backends/imgui_impl_sdl.cpp
--- a/source/editor/imgui/backends/imgui_impl_sdl.h
+++ b/source/editor/imgui/backends/imgui_impl_sdl.h
--- a/source/editor/imgui/backends/imgui_impl_vulkan.cpp
+++ b/source/editor/imgui/backends/imgui_impl_vulkan.cpp
--- a/source/editor/imgui/backends/imgui_impl_vulkan.h
+++ b/source/editor/imgui/backends/imgui_impl_vulkan.h
--- a/source/editor/imgui/backends/imgui_impl_wgpu.cpp
+++ b/source/editor/imgui/backends/imgui_impl_wgpu.cpp
--- a/source/editor/imgui/backends/imgui_impl_wgpu.h
+++ b/source/editor/imgui/backends/imgui_impl_wgpu.h
--- a/source/editor/imgui/backends/imgui_impl_win32.cpp
+++ b/source/editor/imgui/backends/imgui_impl_win32.cpp
--- a/source/editor/imgui/backends/imgui_impl_win32.h
+++ b/source/editor/imgui/backends/imgui_impl_win32.h
--- a/source/editor/imgui/backends/vulkan/glsl_shader.frag
+++ b/source/editor/imgui/backends/vulkan/glsl_shader.frag
--- a/source/editor/imgui/backends/vulkan/glsl_shader.vert
+++ b/source/editor/imgui/backends/vulkan/glsl_shader.vert
--- a/source/editor/imgui/imconfig.h
+++ b/source/editor/imgui/imconfig.h
--- a/source/editor/imgui/imgui.cpp
+++ b/source/editor/imgui/imgui.cpp
--- a/source/editor/imgui/imgui.h
+++ b/source/editor/imgui/imgui.h
--- a/source/editor/imgui/imgui_demo.cpp
+++ b/source/editor/imgui/imgui_demo.cpp
--- a/source/editor/imgui/imgui_draw.cpp
+++ b/source/editor/imgui/imgui_draw.cpp
--- a/source/editor/imgui/imgui_internal.h
+++ b/source/editor/imgui/imgui_internal.h
--- a/source/editor/imgui/imgui_tables.cpp
+++ b/source/editor/imgui/imgui_tables.cpp
--- a/source/editor/imgui/imgui_widgets.cpp
+++ b/source/editor/imgui/imgui_widgets.cpp
--- a/source/editor/imgui/imstb_rectpack.h
+++ b/source/editor/imgui/imstb_rectpack.h
--- a/source/editor/imgui/imstb_textedit.h
+++ b/source/editor/imgui/imstb_textedit.h
--- a/source/editor/imgui/imstb_truetype.h
+++ b/source/editor/imgui/imstb_truetype.h
--- a/source/engine/2dcamera.h
+++ b/source/engine/2dcamera.h
--- a/source/engine/2dphysics.c
+++ b/source/engine/2dphysics.c
--- a/source/engine/2dphysics.h
+++ b/source/engine/2dphysics.h
--- a/source/engine/3dphysics.c
+++ b/source/engine/3dphysics.c
--- a/source/engine/3dphysics.h
+++ b/source/engine/3dphysics.h
--- a/source/engine/billboard.h
+++ b/source/engine/billboard.h
--- a/source/engine/camera.c
+++ b/source/engine/camera.c
--- a/source/engine/camera.h
+++ b/source/engine/camera.h
--- a/source/engine/component.h
+++ b/source/engine/component.h
--- a/source/engine/config.h
+++ b/source/engine/config.h
--- a/source/engine/datastream.c
+++ b/source/engine/datastream.c
--- a/source/engine/datastream.h
+++ b/source/engine/datastream.h
--- a/source/engine/debugdraw.c
+++ b/source/engine/debugdraw.c
--- a/source/engine/debugdraw.h
+++ b/source/engine/debugdraw.h
--- a/source/engine/engine.c
+++ b/source/engine/engine.c
--- a/source/engine/engine.h
+++ b/source/engine/engine.h
--- a/source/engine/font.c
+++ b/source/engine/font.c
--- a/source/engine/font.h
+++ b/source/engine/font.h
--- a/source/engine/gameobject.c
+++ b/source/engine/gameobject.c
--- a/source/engine/gameobject.h
+++ b/source/engine/gameobject.h
--- a/source/engine/gizmo.c
+++ b/source/engine/gizmo.c
--- a/source/engine/gizmo.h
+++ b/source/engine/gizmo.h
--- a/source/engine/input.c
+++ b/source/engine/input.c
--- a/source/engine/input.h
+++ b/source/engine/input.h
--- a/source/engine/level.c
+++ b/source/engine/level.c
--- a/source/engine/level.h
+++ b/source/engine/level.h
--- a/source/engine/light.c
+++ b/source/engine/light.c
--- a/source/engine/light.h
+++ b/source/engine/light.h
--- a/source/engine/log.c
+++ b/source/engine/log.c
--- a/source/engine/log.h
+++ b/source/engine/log.h
--- a/source/engine/mathc.c
+++ b/source/engine/mathc.c
--- a/source/engine/mathc.h
+++ b/source/engine/mathc.h
--- a/source/engine/mesh.c
+++ b/source/engine/mesh.c
--- a/source/engine/mesh.h
+++ b/source/engine/mesh.h
--- a/source/engine/model.c
+++ b/source/engine/model.c
--- a/source/engine/model.h
+++ b/source/engine/model.h
--- a/source/engine/openglrender.c
+++ b/source/engine/openglrender.c
--- a/source/engine/openglrender.h
+++ b/source/engine/openglrender.h
--- a/source/engine/registry.c
+++ b/source/engine/registry.c
--- a/source/engine/registry.h
+++ b/source/engine/registry.h
--- a/source/engine/render.c
+++ b/source/engine/render.c
--- a/source/engine/render.h
+++ b/source/engine/render.h
--- a/source/engine/resources.c
+++ b/source/engine/resources.c
--- a/source/engine/resources.h
+++ b/source/engine/resources.h
--- a/Show more
+++ b/Show more