mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix Makefile build

Browse source 
A missing header (acconf.h) issue was introduced in 34575a9786
In 419386aadd, some new source files have been added but not added to the file list in Makefile
This commit is contained in:
wangqr 2019-09-02 13:32:36 -04:00
parent 888be0607f
commit 3225ae39f4
4 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -78,6 +78,7 @@ elseif(WIN32)
) )
endif(UNIX) endif(UNIX)
SET_TARGET_PROPERTIES(libaegisub PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(libaegisub PROPERTIES PREFIX "")
target_compile_definitions(libaegisub PRIVATE CMAKE_BUILD)
add_library(luabins STATIC add_library(luabins STATIC
vendor/luabins/src/fwrite.c vendor/luabins/src/fwrite.c
@ -428,6 +429,7 @@ add_executable(Aegisub WIN32
src/visual_feature.cpp src/visual_feature.cpp
) )
target_link_libraries(Aegisub ${CMAKE_DL_LIBS} libaegisub luabins luajit resrc csri) target_link_libraries(Aegisub ${CMAKE_DL_LIBS} libaegisub luabins luajit resrc csri)
target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD)
if (MSVC) if (MSVC)
set_target_properties(libaegisub PROPERTIES COMPILE_FLAGS "/Yu${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h" COMPILE_FLAGS "/FI${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h") set_target_properties(libaegisub PROPERTIES COMPILE_FLAGS "/Yu${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h" COMPILE_FLAGS "/FI${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h")

3
libaegisub/lagi_pre.h
View file

@ -1,4 +1,7 @@
#ifdef __cplusplus #ifdef __cplusplus
#if !defined(_WIN32) && !defined(CMAKE_BUILD)
#include "../acconf.h"
#endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

1
src/Makefile
View file

@ -66,6 +66,7 @@ src_OBJ := \
$(d)help_button.o \ $(d)help_button.o \
$(d)hotkey.o \ $(d)hotkey.o \
$(d)hotkey_data_view_model.o \ $(d)hotkey_data_view_model.o \
$(d)image_position_picker.o \
$(d)initial_line_state.o \ $(d)initial_line_state.o \
$(d)main.o \ $(d)main.o \
$(d)menu.o \ $(d)menu.o \

4
src/agi_pre.h
View file

@ -48,6 +48,10 @@
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#if !defined(_WIN32) && !defined(CMAKE_BUILD)
#include "../acconf.h"
#endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
// Common C // Common C