Add warnings to building with GCC/Clang.
* These were mostly copied from the old Makefile.
* The files including wxWidgets need -Wno-old-style-cast done in the code via pragmas because I do not want to disable that warning for the rest of the files. (It might've been overkill for some places where wxWidgets was included, but whatever.)
Naram Qashat authored on 2021/04/04 23:35:09
Showing 1 changed files
| ... | ... |
@@ -15,7 +15,7 @@ set(HEADERS |
| 15 | 15 |
vbam/gba/Sound.h |
| 16 | 16 |
XSFConfig_GSF.h |
| 17 | 17 |
XSFConfigDialog_GSF.h) |
| 18 |
-set(SOURCES |
|
| 18 |
+set(VBAM_SOURCES |
|
| 19 | 19 |
vbam/apu/Blip_Buffer.cpp |
| 20 | 20 |
vbam/apu/Gb_Apu.cpp |
| 21 | 21 |
vbam/apu/Gb_Oscs.cpp |
| ... | ... |
@@ -25,12 +25,22 @@ set(SOURCES |
| 25 | 25 |
vbam/gba/GBA-arm.cpp |
| 26 | 26 |
vbam/gba/GBA-thumb.cpp |
| 27 | 27 |
vbam/gba/Globals.cpp |
| 28 |
- vbam/gba/Sound.cpp |
|
| 28 |
+ vbam/gba/Sound.cpp) |
|
| 29 |
+set(SOURCES |
|
| 30 |
+ ${VBAM_SOURCES}
|
|
| 29 | 31 |
XSFConfig_GSF.cpp |
| 30 | 32 |
XSFConfigDialog_GSF.cpp |
| 31 | 33 |
XSFPlayer_GSF.cpp) |
| 32 | 34 |
|
| 35 |
+set(VBAM_COMPILE_OPTIONS |
|
| 36 |
+ $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wno-unused-variable -Wno-implicit-fallthrough> |
|
| 37 |
+ $<$<CXX_COMPILER_ID:GNU>:-Wno-unused-but-set-variable>) |
|
| 38 |
+ |
|
| 39 |
+set_source_files_properties(${VBAM_SOURCES} PROPERTIES
|
|
| 40 |
+ COMPILE_OPTIONS "${VBAM_COMPILE_OPTIONS}")
|
|
| 41 |
+ |
|
| 33 | 42 |
add_library(in_gsf SHARED ${HEADERS} ${SOURCES})
|
| 43 |
+set_target_properties(in_gsf PROPERTIES PREFIX "") |
|
| 34 | 44 |
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Header Files" FILES ${HEADERS})
|
| 35 | 45 |
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Source Files" FILES ${SOURCES})
|
| 36 | 46 |
target_compile_options(in_gsf PUBLIC |
Add wxWidgets-based configuration dialog boxes.
* Removes the configuration dialog boxes that used my DialogBuilder.
* Move default configuration values to be inlined within the headers.
* Moved 2SF's and GSF's XSFConfig classes to their own headers to accommodate the new wxWidgets dialog boxes.
* Make it so NCSF's SoundView dialog can be toggled on or off from the configuration dialog box.
Naram Qashat authored on 2021/04/04 12:46:14
Showing 1 changed files
| ... | ... |
@@ -12,7 +12,9 @@ set(HEADERS |
| 12 | 12 |
vbam/gba/GBAcpu.h |
| 13 | 13 |
vbam/gba/GBAinline.h |
| 14 | 14 |
vbam/gba/Globals.h |
| 15 |
- vbam/gba/Sound.h) |
|
| 15 |
+ vbam/gba/Sound.h |
|
| 16 |
+ XSFConfig_GSF.h |
|
| 17 |
+ XSFConfigDialog_GSF.h) |
|
| 16 | 18 |
set(SOURCES |
| 17 | 19 |
vbam/apu/Blip_Buffer.cpp |
| 18 | 20 |
vbam/apu/Gb_Apu.cpp |
| ... | ... |
@@ -25,6 +27,7 @@ set(SOURCES |
| 25 | 27 |
vbam/gba/Globals.cpp |
| 26 | 28 |
vbam/gba/Sound.cpp |
| 27 | 29 |
XSFConfig_GSF.cpp |
| 30 |
+ XSFConfigDialog_GSF.cpp |
|
| 28 | 31 |
XSFPlayer_GSF.cpp) |
| 29 | 32 |
|
| 30 | 33 |
add_library(in_gsf SHARED ${HEADERS} ${SOURCES})
|
Silence various Visual Studio warnings:
* Fix the ones in my code where I could use a proper type or valid casts.
* Ignore the designer-time and compiler-time warnings in vendor code or in my code where I am unable to suppress them via casting.
(Most of these were ignored already before introducing the CMake scripts, because they were in vendor code or were annoying to deal with.)
Naram Qashat authored on 2021/03/29 00:10:11
Showing 1 changed files
| ... | ... |
@@ -30,5 +30,7 @@ set(SOURCES |
| 30 | 30 |
add_library(in_gsf SHARED ${HEADERS} ${SOURCES})
|
| 31 | 31 |
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Header Files" FILES ${HEADERS})
|
| 32 | 32 |
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Source Files" FILES ${SOURCES})
|
| 33 |
+target_compile_options(in_gsf PUBLIC |
|
| 34 |
+ $<$<CXX_COMPILER_ID:MSVC>:/wd4127 /wd4189 /wd26495 /wd26812>) |
|
| 33 | 35 |
target_link_libraries(in_gsf |
| 34 | 36 |
in_xsf_framework) |
Add CMake scripts in preparation for wxWidgets changes.
(One downside here, zlib's CMake script renames its zconf.h... which in turn means that the submodule now thinks there are uncommitted changes. :/)
Naram Qashat authored on 2021/03/28 19:43:33
Showing 1 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,34 @@ |
| 1 |
+set(HEADERS |
|
| 2 |
+ vbam/apu/blargg_common.h |
|
| 3 |
+ vbam/apu/blargg_config.h |
|
| 4 |
+ vbam/apu/Blip_Buffer.h |
|
| 5 |
+ vbam/apu/Gb_Apu.h |
|
| 6 |
+ vbam/apu/Gb_Oscs.h |
|
| 7 |
+ vbam/apu/Multi_Buffer.h |
|
| 8 |
+ vbam/common/Port.h |
|
| 9 |
+ vbam/common/SoundDriver.h |
|
| 10 |
+ vbam/gba/bios.h |
|
| 11 |
+ vbam/gba/GBA.h |
|
| 12 |
+ vbam/gba/GBAcpu.h |
|
| 13 |
+ vbam/gba/GBAinline.h |
|
| 14 |
+ vbam/gba/Globals.h |
|
| 15 |
+ vbam/gba/Sound.h) |
|
| 16 |
+set(SOURCES |
|
| 17 |
+ vbam/apu/Blip_Buffer.cpp |
|
| 18 |
+ vbam/apu/Gb_Apu.cpp |
|
| 19 |
+ vbam/apu/Gb_Oscs.cpp |
|
| 20 |
+ vbam/apu/Multi_Buffer.cpp |
|
| 21 |
+ vbam/gba/bios.cpp |
|
| 22 |
+ vbam/gba/GBA.cpp |
|
| 23 |
+ vbam/gba/GBA-arm.cpp |
|
| 24 |
+ vbam/gba/GBA-thumb.cpp |
|
| 25 |
+ vbam/gba/Globals.cpp |
|
| 26 |
+ vbam/gba/Sound.cpp |
|
| 27 |
+ XSFConfig_GSF.cpp |
|
| 28 |
+ XSFPlayer_GSF.cpp) |
|
| 29 |
+ |
|
| 30 |
+add_library(in_gsf SHARED ${HEADERS} ${SOURCES})
|
|
| 31 |
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Header Files" FILES ${HEADERS})
|
|
| 32 |
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Source Files" FILES ${SOURCES})
|
|
| 33 |
+target_link_libraries(in_gsf |
|
| 34 |
+ in_xsf_framework) |