diff options
| -rw-r--r-- | build_linux.sh | 4 | ||||
| -rw-r--r-- | build_win32.bat | 4 | ||||
| -rw-r--r-- | misc/generated/LICENSE.h (renamed from misc/osx/LICENSE.h) | 0 | ||||
| -rw-r--r-- | misc/generated/folder.h (renamed from misc/osx/folder.h) | 0 | ||||
| -rw-r--r-- | misc/generated/imfiledialog_LICENSE.h (renamed from misc/osx/imfiledialog_LICENSE.h) | 0 | ||||
| -rw-r--r-- | misc/generated/imgui_LICENSE.h (renamed from misc/osx/imgui_LICENSE.h) | 0 | ||||
| -rw-r--r-- | misc/generated/logo_64.h (renamed from misc/osx/logo_64.h) | 0 | ||||
| -rw-r--r-- | misc/generated/search.h (renamed from misc/osx/search.h) | 0 | ||||
| -rw-r--r-- | src/definitions.cpp | 16 |
9 files changed, 10 insertions, 14 deletions
diff --git a/build_linux.sh b/build_linux.sh index 7d8bf97..e3e30df 100644 --- a/build_linux.sh +++ b/build_linux.sh @@ -9,9 +9,7 @@ if [[ $* == *-release* ]]; then fi mkdir -p $OUT_DIR - -ld -r -b binary -o bin/debug/data.obj LICENSE misc/logo_64.png imgui/LICENSE imfiledialog/LICENSE misc/search.png misc/folder.png -g++ -m64 -std=c++17 $FLAGS -DUNICODE -o $OUT_DIR/text-search imgui/imgui*.cpp imgui/backends/imgui_impl_glfw.cpp src/widgets/*.cpp src/*.cpp imfiledialog/*.cpp src/linux/*.cpp bin/debug/data.obj -Iimgui -Iimgui/backends -Isrc -Isrc/linux -pthread -ldl -lglfw -lGLU -lGL +g++ -m64 -std=c++17 $FLAGS -DUNICODE -o $OUT_DIR/text-search imgui/imgui*.cpp imgui/backends/imgui_impl_glfw.cpp src/widgets/*.cpp src/*.cpp imfiledialog/*.cpp src/linux/*.cpp -Iimgui -Iimgui/backends -Isrc -Isrc/linux -pthread -ldl -lglfw -lGLU -lGL if [[ $* == *-r* ]]; then ./$OUT_DIR/text-search diff --git a/build_win32.bat b/build_win32.bat index c95f984..a2b8de6 100644 --- a/build_win32.bat +++ b/build_win32.bat @@ -3,15 +3,15 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary @set OUT_EXE=text-search @set INCLUDES=/I..\.. /I..\..\backends @set SOURCES=imgui/imgui*.cpp src/*.cpp imfiledialog/*.cpp src/windows/*.cpp imgui/backends/imgui_impl_win32.cpp src/widgets/*.cpp -@set LIBS=opengl32.lib Advapi32.lib Shell32.lib Ole32.lib User32.lib Pathcch.lib bin/debug/data.obj bin/debug/icon.res +@set LIBS=opengl32.lib Advapi32.lib Shell32.lib Ole32.lib User32.lib Pathcch.lib bin/debug/icon.res @set FLAGS= windres misc/icon.rc -O coff -o bin/debug/icon.res -ld -r -b binary -o bin/debug/data.obj LICENSE misc/logo_64.png imgui/LICENSE imfiledialog/LICENSE misc/search.png misc/folder.png if "%1"=="-release" ( @set OUT_DIR=bin\\release @set FLAGS=/GL /O2 /DTS_RELEASE ) + mkdir %OUT_DIR% cl /std:c++17 /nologo %FLAGS% /W3 /Zi /MD /EHsc /Isrc/windows /Iimgui /Iimgui/backends /Isrc /utf-8 %INCLUDES% /D UNICODE /D _UNICODE %SOURCES% /Fe%OUT_DIR%/%OUT_EXE%.exe /Fd%OUT_DIR%/vc140.pdb /Fo%OUT_DIR%/ /link %LIBS% if "%1"=="-r" call "bin/debug/text-search.exe" diff --git a/misc/osx/LICENSE.h b/misc/generated/LICENSE.h index 350c552..350c552 100644 --- a/misc/osx/LICENSE.h +++ b/misc/generated/LICENSE.h diff --git a/misc/osx/folder.h b/misc/generated/folder.h index 50c40c0..50c40c0 100644 --- a/misc/osx/folder.h +++ b/misc/generated/folder.h diff --git a/misc/osx/imfiledialog_LICENSE.h b/misc/generated/imfiledialog_LICENSE.h index 53ce2a7..53ce2a7 100644 --- a/misc/osx/imfiledialog_LICENSE.h +++ b/misc/generated/imfiledialog_LICENSE.h diff --git a/misc/osx/imgui_LICENSE.h b/misc/generated/imgui_LICENSE.h index d6e4e20..d6e4e20 100644 --- a/misc/osx/imgui_LICENSE.h +++ b/misc/generated/imgui_LICENSE.h diff --git a/misc/osx/logo_64.h b/misc/generated/logo_64.h index 7f9f60e..7f9f60e 100644 --- a/misc/osx/logo_64.h +++ b/misc/generated/logo_64.h diff --git a/misc/osx/search.h b/misc/generated/search.h index d506746..d506746 100644 --- a/misc/osx/search.h +++ b/misc/generated/search.h diff --git a/src/definitions.cpp b/src/definitions.cpp index 4e44572..274e009 100644 --- a/src/definitions.cpp +++ b/src/definitions.cpp @@ -1,27 +1,25 @@ #include "definitions.h" -#ifdef __APPLE__ -#include "../misc/osx/LICENSE.h" +#include "../misc/generated/LICENSE.h" unsigned char* _binary_LICENSE_start = LICENSE; unsigned char* _binary_LICENSE_end = _binary_LICENSE_start + LICENSE_len; -#include "../misc/osx/imgui_LICENSE.h" +#include "../misc/generated/imgui_LICENSE.h" unsigned char* _binary_imgui_LICENSE_start = imgui_LICENSE; unsigned char* _binary_imgui_LICENSE_end = imgui_LICENSE + imgui_LICENSE_len; -#include "../misc/osx/imfiledialog_LICENSE.h" +#include "../misc/generated/imfiledialog_LICENSE.h" unsigned char* _binary_imfiledialog_LICENSE_start = imfiledialog_LICENSE; unsigned char* _binary_imfiledialog_LICENSE_end = imfiledialog_LICENSE + imfiledialog_LICENSE_len; -#include "../misc/osx/logo_64.h" +#include "../misc/generated/logo_64.h" unsigned char* _binary_misc_logo_64_png_start = misc_logo_64_png; unsigned char* _binary_misc_logo_64_png_end = misc_logo_64_png + misc_logo_64_png_len; -#include "../misc/osx/search.h" +#include "../misc/generated/search.h" unsigned char* _binary_misc_search_png_start = misc_search_png; unsigned char* _binary_misc_search_png_end = misc_search_png + misc_search_png_len; -#include "../misc/osx/folder.h" +#include "../misc/generated/folder.h" unsigned char* _binary_misc_folder_png_start = misc_folder_png; -unsigned char* _binary_misc_folder_png_end = misc_folder_png + misc_folder_png_len; -#endif
\ No newline at end of file +unsigned char* _binary_misc_folder_png_end = misc_folder_png + misc_folder_png_len;
\ No newline at end of file |
