From 29de71a827013b184e1a21a7ddd2b31a2fa9b0cc Mon Sep 17 00:00:00 2001 From: Benjamin Kyd Date: Tue, 12 Feb 2019 13:25:14 +0000 Subject: [PATCH] Added windows support for the OpenGL example cube --- OpenGL/cube/CMakeLists.txt | 60 +++++++--- OpenGL/cube/src/main.cpp | 6 + ...jashdjwhdjdopasjdfkihwjldhkjashdkjhjwkdhas | 104 ++++++++++++++++++ 3 files changed, 157 insertions(+), 13 deletions(-) create mode 100644 dasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdasdwdasdwdasdwdasdwdasdgjashdjwhdjdopasjdfkihwjldhkjashdkjhjwkdhas diff --git a/OpenGL/cube/CMakeLists.txt b/OpenGL/cube/CMakeLists.txt index c430cb9..2169367 100644 --- a/OpenGL/cube/CMakeLists.txt +++ b/OpenGL/cube/CMakeLists.txt @@ -9,18 +9,37 @@ set(executable cube.a) set(SrcDIR ./src) set(IncludeDIR ./include) -find_package(SDL2 REQUIRED) -find_package(SDL2_image REQUIRED) -find_package(PNG REQUIRED) -find_package(JPEG REQUIRED) +if (UNIX) + find_package(SDL2 REQUIRED) + find_package(SDL2_image REQUIRED) + find_package(PNG REQUIRED) + find_package(JPEG REQUIRED) +endif(UNIX) + +if (WIN32) + SET(CMAKE_CXX_FLAGS "-IC:/dev/SDL2/include/ -LC:/dev/SDL2/lib/x64/") + SET(CMAKE_CXX_FLAGS "-IC:/dev/SDL2_image/include/ -LC:/dev/SDL2_image/lib/x64/") + SET(CMAKE_CXX_FLAGS "-IC:/dev/glm") + + include_directories(${executable} + "C:/dev/glm" + "C:/dev/SDL2/include/" + "C:/dev/SDL2_image/include/" + ) +endif (WIN32) set(THREADS_PREFER_PTHREAD_FLAD ON) find_package(Threads REQUIRED) find_package(OpenGL REQUIRED) +if (UNIX) + include_directories(${executable} + ${SDL2_INCLUDE_DIR} + ${SDL2_IMAGE_INCLUDE_DIR} + ) +endif (UNIX) + include_directories(${executable} - ${SDL2_INCLUDE_DIR} - ${SDL2_IMAGE_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} ${IncludeDIR} @@ -37,13 +56,28 @@ set_target_properties(${executable} PROPERTIES CXX_EXTENSIONS OFF ) +if (UNIX) + target_link_libraries(${executable} + SDL2 + SDL2_image + PNG::PNG + JPEG::JPEG + OpenGL::OpenGL + OpenGL::GL + Threads::Threads + ) +endif (UNIX) + +if (WIN32) + target_link_libraries(${executable} + "C:/dev/SDL2/lib/x64/SDL2.lib" + "C:/dev/SDL2/lib/x64/SDL2main.lib" + "C:/dev/SDL2/lib/x64/SDL2test.lib" + "C:/dev/SDL2_image/lib/x64/SDL2_image.lib" + ${WinSDK} + ) +endif (WIN32) + target_link_libraries(${executable} ${CMAKE_DL_LIBS} - OpenGL::OpenGL - OpenGL::GL - SDL2 - SDL2_image - PNG::PNG - JPEG::JPEG - Threads::Threads ) diff --git a/OpenGL/cube/src/main.cpp b/OpenGL/cube/src/main.cpp index 2d91b54..90a460b 100644 --- a/OpenGL/cube/src/main.cpp +++ b/OpenGL/cube/src/main.cpp @@ -1,7 +1,12 @@ #include #include +#ifdef _WIN32 +#include +#include +#else #include #include +#endif #include #include #include @@ -158,6 +163,7 @@ int main(int argc, char** argv) { } // Set up a GL texture GLuint tex; + glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); // Set mag and min filtering levels glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); diff --git a/dasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdasdwdasdwdasdwdasdwdasdgjashdjwhdjdopasjdfkihwjldhkjashdkjhjwkdhas b/dasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdasdwdasdwdasdwdasdwdasdgjashdjwhdjdopasjdfkihwjldhkjashdkjhjwkdhas new file mode 100644 index 0000000..69fc0f1 --- /dev/null +++ b/dasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdwdasdasdwdasdwdasdwdasdwdasdgjashdjwhdjdopasjdfkihwjldhkjashdkjhjwkdhas @@ -0,0 +1,104 @@ + + SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS + + Commands marked with * may be preceded by a number, _N. + Notes in parentheses indicate the behavior if _N is given. + A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K. + + h H Display this help. + q :q Q :Q ZZ Exit. + --------------------------------------------------------------------------- + + MMOOVVIINNGG + + e ^E j ^N CR * Forward one line (or _N lines). + y ^Y k ^K ^P * Backward one line (or _N lines). + f ^F ^V SPACE * Forward one window (or _N lines). + b ^B ESC-v * Backward one window (or _N lines). + z * Forward one window (and set window to _N). + w * Backward one window (and set window to _N). + ESC-SPACE * Forward one window, but don't stop at end-of-file. + d ^D * Forward one half-window (and set half-window to _N). + u ^U * Backward one half-window (and set half-window to _N). + ESC-) RightArrow * Right one half screen width (or _N positions). + ESC-( LeftArrow * Left one half screen width (or _N positions). + ESC-} ^RightArrow Right to last column displayed. + ESC-{ ^LeftArrow Left to first column. + F Forward forever; like "tail -f". + ESC-F Like F but stop when search pattern is found. + r ^R ^L Repaint screen. + R Repaint screen, discarding buffered input. + --------------------------------------------------- + Default "window" is the screen height. + Default "half-window" is half of the screen height. + --------------------------------------------------------------------------- + + SSEEAARRCCHHIINNGG + + /_p_a_t_t_e_r_n * Search forward for (_N-th) matching line. + ?_p_a_t_t_e_r_n * Search backward for (_N-th) matching line. + n * Repeat previous search (for _N-th occurrence). + N * Repeat previous search in reverse direction. + ESC-n * Repeat previous search, spanning files. + ESC-N * Repeat previous search, reverse dir. & spanning files. + ESC-u Undo (toggle) search highlighting. + &_p_a_t_t_e_r_n * Display only matching lines + --------------------------------------------------- + A search pattern may be preceded by one or more of: + ^N or ! Search for NON-matching lines. + ^E or * Search multiple files (pass thru END OF FILE). + ^F or @ Start search at FIRST file (for /) or last file (for ?). + ^K Highlight matches, but don't move (KEEP position). + ^R Don't use REGULAR EXPRESSIONS. + --------------------------------------------------------------------------- + + JJUUMMPPIINNGG + + g < ESC-< * Go to first line in file (or line _N). + G > ESC-> * Go to last line in file (or line _N). + p % * Go to beginning of file (or _N percent into file). + t * Go to the (_N-th) next tag. + T * Go to the (_N-th) previous tag. + { ( [ * Find close bracket } ) ]. + } ) ] * Find open bracket { ( [. + ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>. + ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_> + --------------------------------------------------- + Each "find close bracket" command goes forward to the close bracket + matching the (_N-th) open bracket in the top line. + Each "find open bracket" command goes backward to the open bracket + matching the (_N-th) close bracket in the bottom line. + + m_<_l_e_t_t_e_r_> Mark the current top line with . + M_<_l_e_t_t_e_r_> Mark the current bottom line with . + '_<_l_e_t_t_e_r_> Go to a previously marked position. + '' Go to the previous position. + ^X^X Same as '. + ESC-M_<_l_e_t_t_e_r_> Clear a mark. + --------------------------------------------------- + A mark is any upper-case or lower-case letter. + Certain marks are predefined: + ^ means beginning of the file + $ means end of the file + --------------------------------------------------------------------------- + + CCHHAANNGGIINNGG FFIILLEESS + + :e [_f_i_l_e] Examine a new file. + ^X^V Same as :e. + :n * Examine the (_N-th) next file from the command line. + :p * Examine the (_N-th) previous file from the command line. + :x * Examine the first (or _N-th) file from the command line. + :d Delete the current file from the command line list. + = ^G :f Print current file name. + --------------------------------------------------------------------------- + + MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS + + -_<_f_l_a_g_> Toggle a command line option [see OPTIONS below]. + --_<_n_a_m_e_> Toggle a command line option, by name. + __<_f_l_a_g_> Display the setting of a command line option. + ___<_n_a_m_e_> Display the setting of an option, by name. + +_c_m_d Execute the less cmd each time a new file is examined. + + !_c_o_m_m_a_n_d Execute the shell command with $SHELL.