github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makefile: remove ugly conditions in find commands

Browse source
This commit is contained in:
Random06457 2022-05-02 23:05:45 +09:00
commit dc6dee0467
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libultraship/Makefile
View file

@ -42,8 +42,7 @@ SRC_DIRS := $(shell find -type d -not -path "*build*")
CXX_FILES := \
$(shell find libultraship/Factories -name *.cpp) \
$(shell find libultraship/Lib/Fast3D -name *.cpp) \
$(shell find libultraship -maxdepth 1 -name *.cpp \
-and -not -wholename "libultraship/WasapiAudioPlayer.cpp") \
$(shell find libultraship -maxdepth 1 -name *.cpp) \
$(shell find libultraship/Lib/ImGui -maxdepth 1 -name *.cpp) \
libultraship/Lib/ImGui/backends/imgui_impl_opengl3.cpp \
libultraship/Lib/ImGui/backends/imgui_impl_sdl.cpp \

4
libultraship/libultraship/WasapiAudioPlayer.cpp
View file

@ -1,3 +1,4 @@
#ifdef _WIN32
#include "WasapiAudioPlayer.h"
#include "spdlog/spdlog.h"
@ -169,4 +170,5 @@ namespace Ship {
}
return S_OK;
}
}
}
#endif

3
soh/Makefile
View file

@ -99,8 +99,7 @@ C_FILES := \
$(shell find soh -type f -name *.c) \
$(shell find src/boot -type f -name *.c) \
$(shell find src/buffers -type f -name *.c) \
$(shell find src/code -type f -name *.c \
-and -not -wholename src/code/z_camera_data.c) \
$(shell find src/code -type f -name *.c) \
$(shell find src/overlays -type f -name *.c) \
src/libultra/gu/coss.c \
src/libultra/gu/guLookAt.c \

2
soh/src/code/z_camera.c
View file

@ -26,7 +26,7 @@ s32 Camera_CheckWater(Camera* camera);
#define FLG_ADJSLOPE (1 << 0)
#define FLG_OFFGROUND (1 << 7)
#include "z_camera_data.c"
#include "z_camera_data.inc"
/*===============================================================*/

0
soh/src/code/z_camera_data.c → soh/src/code/z_camera_data.inc
View file