Skip to content

reduce warnings #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Naruto merged 5 commits into from
Apr 5, 2025
Merged

reduce warnings #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38d2ab5
update glew to 2.2.0
Naruto Apr 1, 2025
50b6a7c
reduce Ss6Converter warning.
Naruto Apr 1, 2025
4fbfa11
delete .travis.yml
Naruto Apr 2, 2025
fb38d9a
fix qt variable.
Naruto Apr 2, 2025
6d44b22
disable sccache.
Naruto Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
version: ${{ env.qtVersion }}
- name: "set QT_PREFIX"
run: echo "QT_PREFIX=${Qt6_DIR}" >> $GITHUB_ENV
run: echo "QT_PREFIX=${QT_ROOT_DIR}" >> $GITHUB_ENV
- name: release build
run: ./Scripts/release_macos.sh
- id: commit
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
platform: [macos-latest]
runs-on: ${{ matrix.platform }}
steps:
- name: Run sccache-cache
uses: mozilla-actions/sccache-action@v0.0.8
with:
version: "v0.10.0"
# - name: Run sccache-cache
# uses: mozilla-actions/sccache-action@v0.0.8
# with:
# version: "v0.10.0"
- uses: actions/checkout@v4
with:
submodules: 'recursive'
Expand All @@ -31,7 +31,7 @@ jobs:
with:
version: ${{ env.qtVersion }}
- name: "set QT_PREFIX"
run: echo "QT_PREFIX=${Qt6_DIR}" >> $GITHUB_ENV
run: echo "QT_PREFIX=${QT_ROOT_DIR}" >> $GITHUB_ENV
- name: release build
run: ./Scripts/release_macos.sh
- id: commit
Expand All @@ -53,6 +53,8 @@ jobs:
uses: seanmiddleditch/gha-setup-ninja@master
# - name: Run sccache-cache
# uses: mozilla-actions/sccache-action@v0.0.8
# with:
# version: "v0.10.0"
- uses: actions/checkout@v4
with:
submodules: 'recursive'
Expand Down
30 changes: 0 additions & 30 deletions .travis.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Build/Viewer2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ juce_add_gui_app(SSView2
CXX_LANGUAGE_STANDARD "C++11")

# lib
set(glew lib/glew-2.1.0/src/glew.c)
include_directories(lib/glew-2.1.0/include)
set(glew lib/glew-2.2.0/src/glew.c)
include_directories(lib/glew-2.2.0/include)

# Controller
set(Controller
Expand Down
14 changes: 7 additions & 7 deletions Build/Viewer2/Viewer2.jucer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MAINGROUP id="PqiQba" name="SSViewer2">
<GROUP id="{9D43D578-FD48-58A0-B214-36284BAFD7DC}" name="Source">
<GROUP id="{00065373-894A-966A-3963-C2D1D1578C85}" name="Lib">
<FILE id="fnCvZv" name="glew.c" compile="1" resource="0" file="lib/glew-2.1.0/src/glew.c"/>
<FILE id="fnCvZv" name="glew.c" compile="1" resource="0" file="lib/glew-2.2.0/src/glew.c"/>
</GROUP>
<GROUP id="{E355B13C-7B29-798E-114E-961791C52FCA}" name="Controller">
<FILE id="A9X1mt" name="Main.cpp" compile="1" resource="0" file="Source/Controller/Main.cpp"/>
Expand Down Expand Up @@ -171,10 +171,10 @@
<XCODE_MAC targetFolder="Builds/MacOSX">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" enablePluginBinaryCopyStep="1" isDebug="1" optimisation="1"
linkTimeOptimisation="0" targetName="Viewer2" headerPath="../../../../Common/Animator&#10;../../../../Common/Drawer&#10;../../../../Common/Helper&#10;../../../../Common/Loader&#10;../../Source&#10;../../lib/glew-2.1.0/include"
linkTimeOptimisation="0" targetName="Viewer2" headerPath="../../../../Common/Animator&#10;../../../../Common/Drawer&#10;../../../../Common/Helper&#10;../../../../Common/Loader&#10;../../Source&#10;../../lib/glew-2.2.0/include"
defines="USE_GLEW&#10;JUCE_MODAL_LOOPS_PERMITTED=1"/>
<CONFIGURATION name="Release" enablePluginBinaryCopyStep="1" isDebug="0" optimisation="3"
linkTimeOptimisation="1" targetName="Viewer2" headerPath="../../../../Common/Animator&#10;../../../../Common/Drawer&#10;../../../../Common/Helper&#10;../../../../Common/Loader&#10;../../Source&#10;../../lib/glew-2.1.0/include"
linkTimeOptimisation="1" targetName="Viewer2" headerPath="../../../../Common/Animator&#10;../../../../Common/Drawer&#10;../../../../Common/Helper&#10;../../../../Common/Loader&#10;../../Source&#10;../../lib/glew-2.2.0/include"
defines="USE_GLEW&#10;JUCE_MODAL_LOOPS_PERMITTED=1"/>
</CONFIGURATIONS>
<MODULEPATHS>
Expand All @@ -192,12 +192,12 @@
<CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
debugInformationFormat="ProgramDatabase" enablePluginBinaryCopyStep="0"
linkTimeOptimisation="0" isDebug="1" optimisation="1" targetName="Viewer2"
headerPath="..\..\..\..\Common\Animator&#10;..\..\..\..\Common\Drawer&#10;..\..\..\..\Common\Helper&#10;..\..\..\..\Common\Loader&#10;..\..\Source&#10;..\..\lib\glew-2.1.0\include"
headerPath="..\..\..\..\Common\Animator&#10;..\..\..\..\Common\Drawer&#10;..\..\..\..\Common\Helper&#10;..\..\..\..\Common\Loader&#10;..\..\Source&#10;..\..\lib\glew-2.2.0\include"
warningsAreErrors="0" defines="USE_GLEW"/>
<CONFIGURATION name="Release" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
debugInformationFormat="ProgramDatabase" enablePluginBinaryCopyStep="0"
linkTimeOptimisation="1" isDebug="0" optimisation="3" targetName="Viewer2"
headerPath="..\..\..\..\Common\Animator&#10;..\..\..\..\Common\Drawer&#10;..\..\..\..\Common\Helper&#10;..\..\..\..\Common\Loader&#10;..\..\Source&#10;..\..\lib\glew-2.1.0\include"
headerPath="..\..\..\..\Common\Animator&#10;..\..\..\..\Common\Drawer&#10;..\..\..\..\Common\Helper&#10;..\..\..\..\Common\Loader&#10;..\..\Source&#10;..\..\lib\glew-2.2.0\include"
defines="USE_GLEW"/>
</CONFIGURATIONS>
<MODULEPATHS>
Expand All @@ -212,9 +212,9 @@
</VS2017>
<VS2019 targetFolder="Builds/VisualStudio2019">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="Viewer2" headerPath="..\..\..\..\Common\Animator&#10;..\..\..\..\Common\Drawer&#10;..\..\..\..\Common\Helper&#10;..\..\..\..\Common\Loader&#10;..\..\Source&#10;..\..\lib\glew-2.1.0\include"
<CONFIGURATION isDebug="1" name="Debug" targetName="Viewer2" headerPath="..\..\..\..\Common\Animator&#10;..\..\..\..\Common\Drawer&#10;..\..\..\..\Common\Helper&#10;..\..\..\..\Common\Loader&#10;..\..\Source&#10;..\..\lib\glew-2.2.0\include"
defines="USE_GLEW"/>
<CONFIGURATION isDebug="0" name="Release" headerPath="..\..\..\..\Common\Animator&#10;..\..\..\..\Common\Drawer&#10;..\..\..\..\Common\Helper&#10;..\..\..\..\Common\Loader&#10;..\..\Source&#10;..\..\lib\glew-2.1.0\include"
<CONFIGURATION isDebug="0" name="Release" headerPath="..\..\..\..\Common\Animator&#10;..\..\..\..\Common\Drawer&#10;..\..\..\..\Common\Helper&#10;..\..\..\..\Common\Loader&#10;..\..\Source&#10;..\..\lib\glew-2.2.0\include"
targetName="Viewer2" defines="USE_GLEW"/>
</CONFIGURATIONS>
<MODULEPATHS>
Expand Down
14 changes: 7 additions & 7 deletions Build/Viewer2/bCMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jucer_project_settings(
jucer_project_files("SSViewer2/Source/Lib"
# Compile Xcode Binary File
# Resource Resource
x . . "lib/glew-2.1.0/src/glew.c"
x . . "lib/glew-2.2.0/src/glew.c"
)

jucer_project_files("SSViewer2/Source/Controller"
Expand Down Expand Up @@ -263,7 +263,7 @@ jucer_export_target_configuration(
"..\\..\\Common\\Helper"
"..\\..\\Common\\Loader"
"Source"
"lib\\glew-2.1.0\\include"
"lib\\glew-2.2.0\\include"
LINK_TIME_OPTIMISATION OFF
OPTIMISATION "-O0 (no optimisation)"
ENABLE_PLUGIN_COPY_STEP ON
Expand All @@ -280,7 +280,7 @@ jucer_export_target_configuration(
"..\\..\\Common\\Helper"
"..\\..\\Common\\Loader"
"Source"
"lib\\glew-2.1.0\\include"
"lib\\glew-2.2.0\\include"
LINK_TIME_OPTIMISATION ON
OPTIMISATION "-O3 (fastest with safe optimisations)"
ENABLE_PLUGIN_COPY_STEP ON
Expand All @@ -302,7 +302,7 @@ jucer_export_target_configuration(
"..\\..\\Common\\Helper"
"..\\..\\Common\\Loader"
"Source"
"lib\\glew-2.1.0\\include"
"lib\\glew-2.2.0\\include"
LINK_TIME_OPTIMISATION OFF
OPTIMISATION "No optimisation"
ENABLE_PLUGIN_COPY_STEP OFF
Expand All @@ -324,7 +324,7 @@ jucer_export_target_configuration(
"..\\..\\Common\\Helper"
"..\\..\\Common\\Loader"
"Source"
"lib\\glew-2.1.0\\include"
"lib\\glew-2.2.0\\include"
LINK_TIME_OPTIMISATION ON
OPTIMISATION "Maximise speed"
ENABLE_PLUGIN_COPY_STEP OFF
Expand All @@ -349,7 +349,7 @@ jucer_export_target_configuration(
"..\\..\\Common\\Helper"
"..\\..\\Common\\Loader"
"Source"
"lib\\glew-2.1.0\\include"
"lib\\glew-2.2.0\\include"
)

jucer_export_target_configuration(
Expand All @@ -363,7 +363,7 @@ jucer_export_target_configuration(
"..\\..\\Common\\Helper"
"..\\..\\Common\\Loader"
"Source"
"lib\\glew-2.1.0\\include"
"lib\\glew-2.2.0\\include"
)

jucer_project_end()
0 Build/Viewer2/lib/glew-2.1.0/LICENSE.txt → Build/Viewer2/lib/glew-2.2.0/LICENSE.txt
View file
Open in desktop
File renamed without changes.
Loading
Loading