diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | build_linux.sh | 6 | ||||
| -rw-r--r-- | build_osx.sh | 16 | ||||
| -rw-r--r-- | build_win32.bat | 3 | ||||
| -rw-r--r-- | misc/icon.rc | 8 | ||||
| -rw-r--r-- | misc/text-search.app/Contents/Info.plist | 2 | ||||
| -rw-r--r-- | src/definitions.h | 2 |
7 files changed, 22 insertions, 17 deletions
@@ -1,5 +1,5 @@ # text-search -Text-search is a GUI Program to find files and text within files for x64 Windows, Linux & MacOS. +Text-search is a GUI Program to find files and text within files for Windows, Linux & MacOS. ) diff --git a/build_linux.sh b/build_linux.sh index 291397e..6cdacad 100644 --- a/build_linux.sh +++ b/build_linux.sh @@ -2,15 +2,17 @@ shopt -s extglob OUT_DIR="bin/debug" FLAGS="-g3 -Wall -DTS_DEBUG" +OUT_EXE="TextSearch" if [[ $* == *-release* ]]; then OUT_DIR="bin/release" FLAGS="-O3 -DTS_RELEASE" + OUT_EXE="TextSearch-x86_64" fi mkdir -p $OUT_DIR -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/unix/*.cpp -Iimgui -Iimgui/backends -Isrc -Isrc/unix -pthread -ldl -lglfw -lGLU -lGL +g++ -m64 -std=c++17 $FLAGS -DUNICODE -o $OUT_DIR/$OUT_EXE imgui/imgui*.cpp imgui/backends/imgui_impl_glfw.cpp src/widgets/*.cpp src/*.cpp imfiledialog/*.cpp src/unix/*.cpp -Iimgui -Iimgui/backends -Isrc -Isrc/unix -pthread -ldl -lglfw -lGLU -lGL if [[ $* == *-r* ]]; then - ./$OUT_DIR/text-search + ./$OUT_DIR/$OUT_EXE fi
\ No newline at end of file diff --git a/build_osx.sh b/build_osx.sh index adb503f..7552b6f 100644 --- a/build_osx.sh +++ b/build_osx.sh @@ -4,26 +4,28 @@ shopt -s extglob OUT_DIR="bin/debug" FLAGS="-g3 -w -DTS_DEBUG" +OUT_EXE="TextSearch" if [[ $* == *-release* ]]; then OUT_DIR="bin/release" FLAGS="-O3 -DTS_RELEASE" + OUT_EXE="TextSearch-x86_64" fi mkdir -p $OUT_DIR # misc items are converted to header files, not embedded. (xxd -i LICENSE misc/osx/LICENSE.h) -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/unix/*.cpp -Iimgui -Iimgui/backends -Isrc -Isrc/unix -pthread -ldl -lglfw -lGL +g++ -m64 -std=c++17 $FLAGS -DUNICODE -o $OUT_DIR/$OUT_EXE imgui/imgui*.cpp imgui/backends/imgui_impl_glfw.cpp src/widgets/*.cpp src/*.cpp imfiledialog/*.cpp src/unix/*.cpp -Iimgui -Iimgui/backends -Isrc -Isrc/unix -pthread -ldl -lglfw -lGL if [[ $* == *-release* ]]; then - cp $OUT_DIR/text-search misc/text-search.app/Contents/MacOS/text-search - install_name_tool -change /usr/local/opt/glfw/lib/libglfw.3.dylib "@executable_path/../Library/libglfw.3.dylib" misc/text-search.app/Contents/MacOS/text-search - install_name_tool -change /usr/local/opt/mesa/lib/libGL.1.dylib "@executable_path/../Library/libGL.1.dylib" misc/text-search.app/Contents/MacOS/text-search - cp -R misc/text-search.app bin/release/text-search.app - rm misc/text-search.app/Contents/MacOS/text-search + cp $OUT_DIR/$OUT_EXE misc/TextSearch-x86_64.app/Contents/MacOS/text-search + install_name_tool -change /usr/local/opt/glfw/lib/libglfw.3.dylib "@executable_path/../Library/libglfw.3.dylib" misc/TextSearch-x86_64.app/Contents/MacOS/text-search + install_name_tool -change /usr/local/opt/mesa/lib/libGL.1.dylib "@executable_path/../Library/libGL.1.dylib" misc/TextSearch-x86_64.app/Contents/MacOS/text-search + cp -R misc/TextSearch-x86_64.app bin/release/TextSearch-x86_64.app + rm misc/TextSearch-x86_64.app/Contents/MacOS/text-search fi if [[ $* == *-r* ]]; then - ./$OUT_DIR/text-search + ./$OUT_DIR/$OUT_EXE fi
\ No newline at end of file diff --git a/build_win32.bat b/build_win32.bat index 049426c..ad001e0 100644 --- a/build_win32.bat +++ b/build_win32.bat @@ -1,6 +1,6 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 @set OUT_DIR=bin\\debug -@set OUT_EXE=text-search +@set OUT_EXE=TextSearch @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/icon.res @@ -13,6 +13,7 @@ if "%1"=="-a" ( if "%1"=="-release" ( @set OUT_DIR=bin\\release + @set OUT_EXE=TextSearch-x86_64 @set FLAGS=/GL /O2 /DTS_RELEASE ) diff --git a/misc/icon.rc b/misc/icon.rc index 1b6b532..7c23136 100644 --- a/misc/icon.rc +++ b/misc/icon.rc @@ -5,8 +5,8 @@ IDI_LOGO ICON "icon.ico" 1 VERSIONINFO -FILEVERSION 0,1,0,0 -PRODUCTVERSION 0,1,0,0 +FILEVERSION 2,3,0,0 +PRODUCTVERSION 2,3,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Aldrik Ramaekers" VALUE "FileDescription", "Text-search" - VALUE "FileVersion", "1.0" + VALUE "FileVersion", "2.3.0" VALUE "InternalName", "Text-search" VALUE "LegalCopyright", "Aldrik Ramaekers" VALUE "OriginalFilename", "Text-search.exe" VALUE "ProductName", "Text-search" - VALUE "ProductVersion", "1.0" + VALUE "ProductVersion", "2.3.0" END END BLOCK "VarFileInfo" diff --git a/misc/text-search.app/Contents/Info.plist b/misc/text-search.app/Contents/Info.plist index 6c99fa8..b6ecf68 100644 --- a/misc/text-search.app/Contents/Info.plist +++ b/misc/text-search.app/Contents/Info.plist @@ -15,7 +15,7 @@ <key>CFBundleSignature</key> <string>FOOZ</string> <key>CFBundleVersion</key> - <string>2.2.0</string> + <string>2.3.0</string> <key>CFBundleIconFile</key> <string>text-search.icns</string> </dict> diff --git a/src/definitions.h b/src/definitions.h index 7a95c3b..9fa83c1 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -1,6 +1,6 @@ #pragma once -#define TS_VERSION "v2.2.0" +#define TS_VERSION "v2.3.0" // Find these with dumpbin [objfile] /SYMBOLS extern "C" |